Few more fixes for DCHM
Merge branch 'master' of https://github.com/MSFT-SharePointPOP-Exporers/ViRT-Test-Phase.git