BZ-13105 fixed query util

Conflicts:
	src/main/js/noesis/UriUtils.js
fixed merge issues