Rework testing for channel numbering simplification, and resulting modifications to simplification code.
Merge branch 'mbst-4019-ingest-pa-channel-data' into stage

Conflicts:
	src/test/java/org/atlasapi/query/v2/testChannelNumberingSimplification.java