Started CTS2 1.1 migration.
Only build the 'master' branch for Travis CI.
Latest CTS2 1.1 changes.
Finished merge with master.
Fixed a bad XML constant.
Fixed a infinite loop in the Exception Factory.
Merge branch 'master' into cts2-1.1

Conflicts:
	cts2-base-service-plugin/pom.xml
	cts2-core/pom.xml
	cts2-filter/pom.xml
	cts2-model/pom.xml
	cts2-plugin-util/pom.xml
	cts2-service/pom.xml
	cts2-webapp-rest-extensions/pom.xml
	cts2-webapp/pom.xml
	cts2-webapp/src/main/java/edu/mayo/cts2/framework/webapp/rest/controller/AssociationController.java
	pom.xml
Finished merge.
Hack 'fix' for Firefox's broken behavior with 408 timeouts.  This should
probably be evaluated further, as to how we want to really handle the
situation.  This is an ugly hack.
Timeout enhancements

Add code to the framework so implementing code can detect whether or not
the service has already taken a timeout and returned an error to the
client.

The thread computing results in the implementing code will now get
interrupted, and can call Timeout.isTimeLimitExceeded() at any point.
If that call returns true, implementing code should return immediately
with no results, as they will be simply be thrown away.  Throwing an
exception is acceptable, it will also be ignored.
Add support for a //codesystemversion/{codesystemversionname} REST API
call.

https://github.com/cts2/cts2-framework/issues/31
add the ability to set read and connect timeouts.
aligning xml software version numbers with exist-service.  The jaxen
update fixes an issue where jaxen was dragging in a dependency on some
very old xml xerces jar files.
Fix ResolvedReadContext to return consistent hashcodes based on its
value
Updated the resolve signature on ValueSetDefinitionResolutionService to remove the entity query from the regular 'resolve.'
Merge branch 'cts2-1.1' of github.com:cts2/cts2-framework into cts2-1.1
fixing a typo
Added a redirect for trailing slashes on URLs.
Merge branch 'cts2-1.1' of github.com:cts2/cts2-framework into cts2-1.1
First step at aligning the JSON output with the new CTS2 JSON Spec.