Update ucb_openberkeley changes from OPENUCB-152.
Merge pull request #2 from ucbpanopoly/develop

Update ucb_openberkeley changes from OPENUCB-152.