Minor javadoc changes.

Correct argument names.
Discourage use of static service locator.
Add filter method to avoid with issue in Scala.