Merge commit 'tags/org.sakaiproject.nakamura-1.4.0' into 1.4-merge

Conflicts:
	app/pom.xml
	app/src/main/bundles/list.xml
	app/src/main/java/org/sakaiproject/nakamura/app/UnBundleStaticContent.java
	bundles/activation-mail/pom.xml
	bundles/activemq/pom.xml
	bundles/activity/api/pom.xml
	bundles/activity/impl/pom.xml
	bundles/authz/pom.xml
	bundles/basiclti/pom.xml
	bundles/batch/pom.xml
	bundles/calendar/pom.xml
	bundles/captcha/pom.xml
	bundles/chat/pom.xml
	bundles/cluster/pom.xml
	bundles/configuration/pom.xml
	bundles/connections/pom.xml
	bundles/content-packaging/pom.xml
	bundles/directory/pom.xml
	bundles/discussion/pom.xml
	bundles/doc/pom.xml
	bundles/docproxy/pom.xml
	bundles/email-outgoing/pom.xml
	bundles/events/pom.xml
	bundles/files/api/pom.xml
	bundles/files/impl/pom.xml
	bundles/files/impl/src/main/resources/SLING-INF/content/var/search/pool/all-all.json
	bundles/files/migrator/pom.xml
	bundles/formauth/pom.xml
	bundles/http/impl/pom.xml
	bundles/http/src/main/java/org/sakaiproject/nakamura/http/cache/CacheControlFilter.java
	bundles/image/pom.xml
	bundles/jaxp-api/pom.xml
	bundles/jcr/pom.xml
	bundles/jetty-config/pom.xml
	bundles/locking/pom.xml
	bundles/lom/pom.xml
	bundles/memory/pom.xml
	bundles/meservice/pom.xml
	bundles/messaging/pom.xml
	bundles/pages/pom.xml
	bundles/personal/pom.xml
	bundles/postgresqlwrapper/pom.xml
	bundles/presence/pom.xml
	bundles/profile/api/pom.xml
	bundles/profile/impl/pom.xml
	bundles/proxy/pom.xml
	bundles/resource/pom.xml
	bundles/robots.txt/pom.xml
	bundles/search/api/pom.xml
	bundles/search/impl/pom.xml
	bundles/securityloader/pom.xml
	bundles/server/pom.xml
	bundles/smtp/pom.xml
	bundles/templates/pom.xml
	bundles/tika/pom.xml
	bundles/trustedauth/pom.xml
	bundles/upgrade/pom.xml
	bundles/user/api/pom.xml
	bundles/user/impl/pom.xml
	bundles/version/pom.xml
	bundles/webconsole-plugins/solr/pom.xml
	bundles/woodstox/pom.xml
	bundles/world/pom.xml
	contrib/casauth/pom.xml
	contrib/csu/pom.xml
	contrib/filters/pom.xml
	contrib/import/pom.xml
	contrib/ldap/pom.xml
	contrib/ldapauth/pom.xml
	contrib/mailman/pom.xml
	contrib/migratecustommimetype/pom.xml
	contrib/migratejcr/pom.xml
	contrib/migratesparseuuid/pom.xml
	contrib/mysql-jdbc/pom.xml
	contrib/nyu-force-migration/pom.xml
	contrib/nyu/pom.xml
	contrib/oracle-jdbc-6/pom.xml
	contrib/oracle-jdbc/pom.xml
	contrib/persondirectory/pom.xml
	contrib/remotefiles/pom.xml
	contrib/restauth/pom.xml
	contrib/rootconfig/pom.xml
	contrib/samlauth/pom.xml
	contrib/sitejoin/pom.xml
	contrib/ucam/pom.xml
	integration/pom.xml
	libraries/testutils/pom.xml
	libraries/utils/pom.xml
	modelling/pom.xml
	pom.xml
	samples/antixss/pom.xml
	samples/fileinstall/hellofromfileinstall/pom.xml
	samples/fileinstall/pom.xml
	samples/fileinstall/slingrunner/pom.xml
	samples/guice/pom.xml
	samples/guiceuser/pom.xml
	samples/helloworld/pom.xml
	samples/jpa/pom.xml
	samples/jpacore/pom.xml
	samples/jpaexample/pom.xml
	samples/jpahelloworld/pom.xml
	samples/jpaprovider/pom.xml
	samples/lifecycle/pom.xml
	samples/persistence/pom.xml
	samples/registry/pom.xml
	samples/session/pom.xml
	samples/shindig/pom.xml
	sandbox/aggregate/pom.xml
	sandbox/contenttest/test1/pom.xml
	sandbox/contenttest/test2/pom.xml
	sandbox/drools/drools-engine/pom.xml
	sandbox/drools/drools-maven-plugin/pom.xml
	sandbox/drools/drools-repository/pom.xml
	sandbox/drools/example-rules/pom.xml
	sandbox/drools/pom.xml
	sandbox/eventexplorer/app/pom.xml
	sandbox/eventexplorer/bundles/cassandrathrift/pom.xml
	sandbox/eventexplorer/bundles/listeners/pom.xml
	sandbox/eventexplorer/bundles/storage/jdbc/pom.xml
	sandbox/eventexplorer/bundles/ui/pom.xml
	sandbox/eventexplorer/pom.xml
	sandbox/imap/pom.xml
	sandbox/jaxrs/pom.xml
	sandbox/opensso/pom.xml
	sandbox/scriptrunner/pom.xml
	sandbox/sessiontest/pom.xml
	sandbox/site/pom.xml
	sandbox/sitetemplates/pom.xml
	testscripts/pom.xml
	tools/version
	tools/version.bat
	webstart/pom.xml
	webstart/src/main/jnlp/template.vm