Merge "DO NOT MERGE - Only autoVerify at install for new hosts" into oc-dev