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'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Support configuring rpc_server_type and index_interval
Merge branch '1.2'

Conflicts:
	gradle.properties
Merge remote-tracking branch 'upstream/master'

Conflicts:
	gradle.properties