Merge "CORD-3158 Consistent ImagePullPolicy"