[Misc] Fix javadoc
[Misc] Fix comments
[Misc] Now that we're using Java7, use the shortcut notation :)
XCOMMONS-455: The test framework mocking CM should mock a dependency only if it does not already exist in the CM
* Add missing javadoc for the new behavior
* Convert an existing test to prove using @AfterComponent works for the use case of injecting a mock CM