Merge pull request #45 from ucbklu/openucb-317

OPENUCB-317: Add openberkeley_core_override