Merge branch 'master' of https://github.com/timiblossom/Priam

Conflicts:
	gradle.properties
	priam/src/main/java/com/netflix/priam/defaultimpl/StandardTuner.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	gradle.properties
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix NPE in restore REST call
Merge remote-tracking branch 'upstream/master'
Adding try-block to catch IllegalThreadStateException
Merge pull request #256 from sagarl/1.1

Adding try-block to catch IllegalThreadStateException
revert get_seed's name formatting as we did not do a throughout testing on this branch yet
Add print-out statement in the try/catch to pass PMD check
[Gradle Release Plugin] - pre tag commit:  '1.1.49'.
[Gradle Release Plugin] - new version commit:  '1.1.50-SNAPSHOT'.
Merge remote-tracking branch 'upstream/master'
Add a log line when there is no meta file in restore.  Also leave assert statement as restore's junit test needs it to pass.
[Gradle Release Plugin] - pre tag commit:  '1.1.50'.
[Gradle Release Plugin] - new version commit:  '1.1.51-SNAPSHOT'.
Close uploading streams in all cases. This avoids the issue "Too many opening files" when there is an S3 issue blocking the uploading and Priam just keeps the filedescriptor around.
Merge pull request #271 from timiblossom/1.1

Close uploading streams in all cases.
[Gradle Release Plugin] - pre tag commit:  '1.1.51'.
[Gradle Release Plugin] - new version commit:  '1.1.52-SNAPSHOT'.