Ensure known aliases on channels are correctly merged.
Merge branch 'cope-with-unrecognised-service-providers' into stage

Conflicts:
	src/main/java/org/atlasapi/remotesite/pa/channels/PaChannelDataHandler.java