Promote variations from rubocop that are consistent in our codebase
First pass to help bosh-dev comply with rubocop