[RuboCop]
Merge branch 'rubocop' into trunk-database-rewrite

Conflicts:
	spec/lib/models/pod_spec.rb