[MERGE] Javelin update....

[Alex Huang]

Master has been merged on to javelin.  We're working through the issues right 
now.  When all unit tests and the automated tests that was done for 
api_refactoring passes on javelin, we'll submit a merge request into master.

--Alex