Fix BZ#1069207 - Uncaught exception 'decodedURL cannot be null' on search for topic 5946.
Merge branch 'master' into devel

Conflicts:
	pom.xml
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/constants/Constants.java