Merge "Gates RotationResolverService with a config flag" into tm-qpr-dev