Updated version + cleanup tools and roomservice.xml

Change-Id: I20a8252d29a800edbbb1a5f0daaebfa3a352c2a3