Working on SyncGTS
Merge branch 'master' of https://github.com/NCIP/cagrid2

Conflicts:
	cagrid-dorian/cagrid-dorian-service-tools/src/main/java/org/cagrid/dorian/service/tools/KeyStoreCreator.java
	cagrid-trust/cagrid-trust-api/src/main/java/org/cagrid/trust/manager/TrustServiceJettySSLContextFactory.java
	cagrid-trust/cagrid-trust-api/src/main/java/org/cagrid/trust/service/TrustService.java
	cagrid-trust/cagrid-trust-service/src/main/java/org/cagrid/trust/service/core/AbstractTrustManager.java
	cagrid-trust/cagrid-trust-service/src/main/java/org/cagrid/trust/service/core/TrustService.java
	cagrid-trust/cagrid-trust-service/src/main/java/org/cagrid/trust/service/core/TrustServiceTrustManager.java
	cagrid-trust/cagrid-trust-service/src/test/java/org/cagrid/trust/service/core/TrustServiceFileSystemCAManagerOnlyTest.java