Scrubbables producer publisher
Merge branch 'mbst-9986-scrubbables'

Conflicts:
	src/main/java/org/atlasapi/media/entity/Publisher.java