Merge "Set 022 umask for image files in salt control" into release/proposed/2019.2.0