make all tests work outside of Eclipse and full gradle build success
Merge branch 'master' of https://github.com/RoddiPotter/cicstart

Conflicts:
	auth/src/test/java/ca/ualberta/physics/cssdp/auth/resource/SessionTests.java
	build.gradle
	catalogue/src/main/webapp/WEB-INF/web.xml
	catalogue/src/test/java/ca/ualberta/physics/cssdp/catalogue/resource/CatalogueTestsScaffolding.java
	catalogue/src/test/java/ca/ualberta/physics/cssdp/catalogue/resource/ProjectResourceTest.java
	common/src/main/java/ca/ualberta/physics/cssdp/configuration/JSONObjectMapperProvider.java
	common/src/test/java/ca/ualberta/physics/cssdp/util/IntegrationTestScaffolding.java
	file/src/test/java/ca/ualberta/physics/cssdp/file/resource/CacheResourceTest.java
	file/src/test/java/ca/ualberta/physics/cssdp/file/resource/HostResourceTest.java
	vfs/build.gradle