19490 / third stage changes

Please reffer to many places on this, such as [it's corresponding worklist task](https://worklist.net/19490) and the following references:
* [General changes / stages on #19490](https://docs.google.com/spreadsheet/ccc?key=0AgVlx5h0SPj9dGZZQm5Makp4cHhtckRGNnMyRlFpbFE&usp=sharing)
* [19490 testing](https://docs.google.com/spreadsheet/ccc?key=0ApqmqOJ7DCOXdHBPVEFYT3h2NE1GaE9saXQxeFpMdFE&usp=sharing)
* [highfidelity/worklist room @ Gitter](https://gitter.im/highfidelity/worklist)