no message
Merge branch 'master' of https://github.com/NCIP/cagrid2

Conflicts:
	cagrid-dorian/cagrid-dorian-wsrf/src/main/resources/META-INF/spring/bundle-context-osgi.xml
	cagrid-dorian/cagrid-dorian-wsrf/src/main/resources/META-INF/spring/dorian-wsrf-configuration.xml
	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/pom.xml
	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/FileSystemTrustedCAManager.java
	cagrid-trust/cagrid-trust-service/src/main/java/org/cagrid/trust/service/core/RevocationEnabledTrustManager.java
	cagrid-trust/cagrid-trust-service/src/main/java/org/cagrid/trust/service/core/SyncGTS.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/main/java/org/cagrid/trust/service/core/TrustedCAEntry.java
	cagrid-trust/cagrid-trust-service/src/main/java/org/cagrid/trust/service/core/TrustedCAManager.java
	cagrid-trust/cagrid-trust-service/src/main/resources/META-INF/spring/trust-service-configuration.xml
	cagrid-trust/cagrid-trust-service/src/test/java/org/cagrid/trust/service/core/TrustServiceFileSystemCAManagerOnlyTest.java
	cagrid-trust/cagrid-trust-service/src/test/java/org/cagrid/trust/service/test/utils/CA.java
	cagrid-trust/cagrid-trust-service/src/test/java/org/cagrid/trust/service/test/utils/Credential.java