Fixup build
Merge pull request #60 from johngatti/Dev

Fixup build
Checkin for Generated Mozu Code 1.11
Merge pull request #61 from bhewett/Dev

Checkin for Generated Mozu Code 1.11
Update mozu_config.properties
Merge remote-tracking branch 'mozu_master/Dev' into Dev

Conflicts:
	mozu-java-test/src/main/resources/mozu_config.properties