Merge branch 'engagepoint/feature/edoc-1008-single-version' into engagepoint/develop

Conflicts:
	boms/modeshape-bom-api/pom.xml
	boms/modeshape-bom-embedded/pom.xml
	boms/modeshape-bom-jbosseap/pom.xml
	boms/modeshape-bom-parent/pom.xml
	boms/modeshape-bom-remote-client/pom.xml
	connectors/modeshape-connector-cmis/pom.xml
	connectors/modeshape-connector-git/pom.xml
	connectors/modeshape-connector-jdbc-metadata/pom.xml
	connectors/pom.xml
	demos/embedded-repo/pom.xml
	demos/pom.xml
	demos/sequencers/pom.xml
	deploy/jbossas/modeshape-jbossas-cmis-war/pom.xml
	deploy/jbossas/modeshape-jbossas-explorer-war/pom.xml
	deploy/jbossas/modeshape-jbossas-subsystem/pom.xml
	deploy/jbossas/modeshape-jbossas-web-rest-war/pom.xml
	deploy/jbossas/modeshape-jbossas-web-webdav-war/pom.xml
	deploy/jbossas/pom.xml
	deploy/pom.xml
	extractors/modeshape-extractor-tika/pom.xml
	extractors/pom.xml
	integration/modeshape-jbossas-integration-tests/pom.xml
	integration/modeshape-jbossas-kit-tests/pom.xml
	integration/pom.xml
	modeshape-assembly-descriptors/pom.xml
	modeshape-client/pom.xml
	modeshape-common/pom.xml
	modeshape-distribution/pom.xml
	modeshape-jca/pom.xml
	modeshape-jcr-api/pom.xml
	modeshape-jcr-tck/pom.xml
	modeshape-jcr/pom.xml
	modeshape-jcr/src/main/java/org/modeshape/jcr/cache/document/WritableSessionCache.java
	modeshape-jdbc-local/pom.xml
	modeshape-jdbc/pom.xml
	modeshape-parent/pom.xml
	modeshape-performance-tests/pom.xml
	modeshape-schematic/pom.xml
	modeshape-unit-test/pom.xml
	pom.xml
	sandbox/modeshape-test-reference-impl/pom.xml
	sequencers/modeshape-sequencer-ddl/pom.xml
	sequencers/modeshape-sequencer-images/pom.xml
	sequencers/modeshape-sequencer-java/pom.xml
	sequencers/modeshape-sequencer-mp3/pom.xml
	sequencers/modeshape-sequencer-msoffice/pom.xml
	sequencers/modeshape-sequencer-sramp/pom.xml
	sequencers/modeshape-sequencer-teiid/pom.xml
	sequencers/modeshape-sequencer-text/pom.xml
	sequencers/modeshape-sequencer-wsdl/pom.xml
	sequencers/modeshape-sequencer-xml/pom.xml
	sequencers/modeshape-sequencer-xsd/pom.xml
	sequencers/modeshape-sequencer-zip/pom.xml
	sequencers/pom.xml
	web/modeshape-web-cmis-war/pom.xml
	web/modeshape-web-cmis/pom.xml
	web/modeshape-web-explorer-war/pom.xml
	web/modeshape-web-explorer/pom.xml
	web/modeshape-web-jcr-rest-client/pom.xml
	web/modeshape-web-jcr-rest-war/pom.xml
	web/modeshape-web-jcr-rest/pom.xml
	web/modeshape-web-jcr-webdav-war/pom.xml
	web/modeshape-web-jcr-webdav/pom.xml
	web/modeshape-web-jcr/pom.xml
	web/modeshape-webdav-war/pom.xml
	web/modeshape-webdav/pom.xml
	web/pom.xml
Merge remote-tracking branch 'origin/engagepoint/develop' into engagepoint/develop

Conflicts:
	boms/modeshape-bom-api/pom.xml
	boms/modeshape-bom-embedded/pom.xml
	boms/modeshape-bom-jbosseap/pom.xml
	boms/modeshape-bom-parent/pom.xml
	boms/modeshape-bom-remote-client/pom.xml
	connectors/modeshape-connector-cmis/pom.xml
	connectors/modeshape-connector-git/pom.xml
	connectors/modeshape-connector-jdbc-metadata/pom.xml
	connectors/pom.xml
	demos/embedded-repo/pom.xml
	demos/pom.xml
	demos/sequencers/pom.xml
	deploy/jbossas/modeshape-jbossas-cmis-war/pom.xml
	deploy/jbossas/modeshape-jbossas-explorer-war/pom.xml
	deploy/jbossas/modeshape-jbossas-subsystem/pom.xml
	deploy/jbossas/modeshape-jbossas-web-rest-war/pom.xml
	deploy/jbossas/modeshape-jbossas-web-webdav-war/pom.xml
	deploy/jbossas/pom.xml
	deploy/pom.xml
	extractors/modeshape-extractor-tika/pom.xml
	extractors/pom.xml
	integration/modeshape-jbossas-integration-tests/pom.xml
	integration/modeshape-jbossas-kit-tests/pom.xml
	integration/pom.xml
	modeshape-assembly-descriptors/pom.xml
	modeshape-client/pom.xml
	modeshape-common/pom.xml
	modeshape-distribution/pom.xml
	modeshape-jca/pom.xml
	modeshape-jcr-api/pom.xml
	modeshape-jcr-tck/pom.xml
	modeshape-jcr/pom.xml
	modeshape-jcr/src/main/java/org/modeshape/jcr/cache/document/WritableSessionCache.java
	modeshape-jdbc-local/pom.xml
	modeshape-jdbc/pom.xml
	modeshape-parent/pom.xml
	modeshape-performance-tests/pom.xml
	modeshape-schematic/pom.xml
	modeshape-unit-test/pom.xml
	pom.xml
	sandbox/modeshape-test-reference-impl/pom.xml
	sequencers/modeshape-sequencer-ddl/pom.xml
	sequencers/modeshape-sequencer-images/pom.xml
	sequencers/modeshape-sequencer-java/pom.xml
	sequencers/modeshape-sequencer-mp3/pom.xml
	sequencers/modeshape-sequencer-msoffice/pom.xml
	sequencers/modeshape-sequencer-sramp/pom.xml
	sequencers/modeshape-sequencer-teiid/pom.xml
	sequencers/modeshape-sequencer-text/pom.xml
	sequencers/modeshape-sequencer-wsdl/pom.xml
	sequencers/modeshape-sequencer-xml/pom.xml
	sequencers/modeshape-sequencer-xsd/pom.xml
	sequencers/modeshape-sequencer-zip/pom.xml
	sequencers/pom.xml
	web/modeshape-web-cmis-war/pom.xml
	web/modeshape-web-cmis/pom.xml
	web/modeshape-web-explorer-war/pom.xml
	web/modeshape-web-explorer/pom.xml
	web/modeshape-web-jcr-rest-client/pom.xml
	web/modeshape-web-jcr-rest-war/pom.xml
	web/modeshape-web-jcr-rest/pom.xml
	web/modeshape-web-jcr-webdav-war/pom.xml
	web/modeshape-web-jcr-webdav/pom.xml
	web/modeshape-web-jcr/pom.xml
	web/modeshape-webdav-war/pom.xml
	web/modeshape-webdav/pom.xml
	web/pom.xml
Merge remote-tracking branch 'origin/engagepoint/develop' into engagepoint/develop
accessable Mapping