rolling back to 1.6 for CI build for reals this time
Merge remote-tracking branch 'origin/master' into java-upgrade-6
Merge branch 'master' into java-upgrade-6
removing useless scripts that we will either never use or have replaced
Merge branch 'java-upgrade-6' of https://github.com/inbloom/secure-data-service into java-upgrade-6
merge master into java-upgrade-6 branch
Update properties.yml to work for local dev
Merge branch 'master' into OPS-387
Merge branch 'master' into java-upgrade-6
the fix for ds-1249: searching by uniqueStateId causes other url params to be ignored

also includes acceptance test
fixed UriMutatorTest unit test
Merge branch 'master' into ds-1249
added defect tag
merge with master
set java version to 1.7