Merge remote-tracking branch 'upstream-1.1/1.1' into 1.1
Merge pull request #236 from jasobrown/1.1

First pass at fixing the s3 client TimeoutConnections problem. Incorporating @johaho's fix from https://github.com/Netflix/Priam/pull/220. 

reviewed by @sagarl
Merge pull request #237 from jasobrown/1.1

call s3client.getObjectMetadata() directly, rather than getting sn S3Object first

reviewed by @timiblossom
ffs, this again?!?!
Provide restorePrefix parameter to be passed in the rest url
Merge pull request #239 from timiblossom/1.1

1.1 - reviewed during checking by Sagar and code by Jason.
lower logging level
Fixing aggregateJavadoc
Merge branch '1.1'

Conflicts:
	gradle.properties
	priam/src/main/java/com/netflix/priam/resources/CassandraAdmin.java