Enable DIC object definitions to be merged with other containers

* Move mock objects into the MockObjectRepository
* Change visibility of some methods
* Rename EmptyDependencyContainer to NullDependencyContainer

Change-Id: I16f5ea5f6db35d22feaea6a968b6b80d7c7e6bc5