Merge "Only autoVerify at install for new hosts" into oc-mr1-dev