Merge branch 'backport-vs-fix-config-map' into vs-fix-config-map

Status Job ID Name Coverage
  External
passed cdash

passed cmake-dash3win7-windows-debug-vs2015

passed ghostflow-branch-check-master

passed ghostflow-commit-check

passed ghostflow-stager

passed cmake-dash3win7-windows-debug-vs2015

passed cmake-dash3win7-windows-debug-vs2015

00:37:24

passed cmake-dash3win7-windows-debug-vs2015

passed cmake-dash3win7-windows-debug-vs2015

passed cmake-dash3win7-windows-debug-vs2015

passed ghostflow-stager

passed ghostflow-stager

passed ghostflow-stager

passed ghostflow-stager

passed ghostflow-stager

passed ghostflow-stager

passed ghostflow-stager

passed ghostflow-stager