Merge branch 'master' into feature/unified-search

Conflicts:
	component/common/pom.xml
	component/core/pom.xml
	component/opensocial/pom.xml
	component/pom.xml
	component/service/pom.xml
	component/webui/pom.xml
	config/pom.xml
	extension/config/pom.xml
	extension/jar/pom.xml
	extension/pom.xml
	extension/war/pom.xml
	extras/feedmash/pom.xml
	extras/injection/pom.xml
	extras/link-composer-plugin/pom.xml
	extras/migration/pom.xml
	extras/pom.xml
	extras/samples/pom.xml
	extras/widget/pom.xml
	extras/widget/resources/pom.xml
	extras/widget/rest/pom.xml
	pom.xml
	webapp/opensocial/pom.xml
	webapp/pom.xml
	webapp/portlet/pom.xml
	webapp/resources/pom.xml