Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	bonita-userfilter-assembly/pom.xml
	bonita-userfilter-custom-user-info/bonita-userfilter-custom-user-info-def/pom.xml
	bonita-userfilter-custom-user-info/bonita-userfilter-custom-user-info-impl/pom.xml
	bonita-userfilter-custom-user-info/pom.xml
	bonita-userfilter-initiator-manager/bonita-userfilter-initiator-manager-def/pom.xml
	bonita-userfilter-initiator-manager/bonita-userfilter-initiator-manager-impl/pom.xml
	bonita-userfilter-initiator-manager/pom.xml
	bonita-userfilter-initiator/bonita-userfilter-initiator-def/pom.xml
	bonita-userfilter-initiator/bonita-userfilter-initiator-impl/pom.xml
	bonita-userfilter-initiator/pom.xml
	bonita-userfilter-package/pom.xml
	bonita-userfilter-same-task-user/bonita-userfilter-same-task-user-def/pom.xml
	bonita-userfilter-same-task-user/bonita-userfilter-same-task-user-impl/pom.xml
	bonita-userfilter-same-task-user/pom.xml
	bonita-userfilter-single-user/bonita-userfilter-single-user-def/pom.xml
	bonita-userfilter-single-user/bonita-userfilter-single-user-impl/pom.xml
	bonita-userfilter-single-user/pom.xml
	bonita-userfilter-tests/pom.xml
	bonita-userfilter-user-manager/bonita-userfilter-user-manager-def/pom.xml
	bonita-userfilter-user-manager/bonita-userfilter-user-manager-impl/pom.xml
	bonita-userfilter-user-manager/pom.xml
	pom.xml