(1) Bug fix for collection ids with Express, (2) updates to dynamic queryToRestMap.
Merge commit '36d8ea7df2c5b8437d3a98d0211ec1e706ebf56a'

Conflicts:
	volos-connectors-common/lib/serverBase.js