model changes to upgrade to swagger 1.2
Merge remote-tracking branch 'upstream/master'