Update queuenames to use mars-<env>-<partner> format.
Merge branch 'feature/aws-customize' into feature/aws-customize-consumer-layer-queue-map

Conflicts:
	opsworks_java/attributes/customize.rb