Adjust MockObjectBuilder to work in a similar fashion as the DependencyBuilder

This provides some consistency between how objects are created either
by using the DIC or the MockObjectBuilder.

Change-Id: Ic4b6ca9f73daab477ec396dfea5bedab05edbde3