Merge gromacs/master into Opencl branch

This is my last planned contribution before buildling the 2-3 patches for uploading to gromacs gerrit for review there