Use gmock 1.6 on Windows. Trying to fix builds. refs #7284
Merge branch 'feature/7284_framework_clang' into develop