Merge "Revert controller verify jobs back to templates"