Merge branch '2.5.0.ci-RELEASE' of https://github.com/conext/shindig into 2.5.0.ci-RELEASE

Conflicts:
	pom.xml