Enabling SSTable2JSON utility via REST call
Adding timeout period for process to run and updating JSON_FILE_PATH as a local var
Merge pull request #308 from sagarl/1.1

Enabling SSTable2JSON utility via REST call
Merge branch '1.1' into 1.2

Conflicts:
	priam/src/main/java/com/netflix/priam/resources/BackupServlet.java
Merge branch '1.2'