AEROGEAR-671 "Add support for Request Params"
Fixing bug where combination of path and query param defaults conflict.
Merge branch 'AEROGEAR-671'