Wip 4982 4983 oloc rebase

Version of 4982 feature that adds namespace to object_locator_t.  This branch also includes the 4983 feature.  It has been rebased on latest master.