Change v4 channel alias to be one that actually resolves
Update simplification with changes to simple Image type field
Merge branch 'image-type-field' into stage

* image-type-field:
  Update simplification with changes to simple Image type field
  Change v4 channel alias to be one that actually resolves

Conflicts:
	src/main/java/org/atlasapi/output/simple/DescribedModelSimplifier.java