Fixup build
Merge pull request #60 from johngatti/Dev

Fixup build
Merge pull request #61 from bhewett/Dev

Checkin for Generated Mozu Code 1.11
Merge remote-tracking branch 'origin/Dev' into Dev