Updated gemstone port of 3.1

- pulling in latest changes from master repo
- including REST package