Add persist state and restart grill services

Conflicts:

	grill-server/src/main/java/com/inmobi/grill/server/GrillService.java
	grill-server/src/main/java/com/inmobi/grill/server/GrillServices.java
	grill-server/src/main/resources/grill-default.xml
	grill-server/src/test/resources/grill-site.xml
Add persistence to query service

Conflicts:

	grill-api/src/main/java/com/inmobi/grill/api/GrillConf.java
	grill-api/src/main/java/com/inmobi/grill/api/query/QueryHandle.java
	grill-server-api/src/main/java/com/inmobi/grill/server/api/query/QueryContext.java
	grill-server/src/main/java/com/inmobi/grill/server/GrillServices.java
	grill-server/src/main/java/com/inmobi/grill/server/query/QueryExecutionServiceImpl.java
	grill-server/src/test/java/com/inmobi/grill/server/GrillJerseyTest.java
Fix setting cancelled state
Fix test cancel query
Update restartability only for launched queries
Update consistent state filter
Update config.apt
Update install-steps doc
Add separate config for enabling restarts and recover from old state
Add non-null check
Update config doc
do not skip the deployment step for grill
Fix typo in Readme