Merge branch '10mappings'
Update error message for mapping end point
Updated example proxies
reenable regex query
Merge pull request #906 from rashidkpc/master

Updated example proxies
Merge remote branch 'upstream/master'