Merging changes from Box.

* Fixed bug that prevented mocking of interfaces
* Added return_value_map
* Added shmock policies