Merge "fixed bug in nbnxn OpenMP non-bonded force reduction" into release-4-6