Rename hive-site.xml to hivedriver-site.xml in server deb
Merge branch 'develop' of https://github.com/InMobi/grill into develop