deeplearning4j/deeplearning4j

Another round of SameDiff and TF import fixes
#6967

AlexDBlack wants to merge ab_fixes into master

Compare on GitHub

We do not currently have an analysis of these two commits