Merge "improve build with OpenMM, still not 100% fixed" into release-4-6