Merge with HEAD
Merge branch 'master' of https://github.com/scality/CaDMIum.git

Conflicts:
	cdmi/src/test/resources/integrationtest.properties