Merge "fixed nbnxn no LJ comb.rule AVX256 PME kernel" into release-4-6