Fix javadoc typo
Fix javadoc typo
Merge pull request #605 from overmindx/master

* pull605:
  Fix javadoc typo
Revert accidental class name change
Align javadoc improvements
Fix test condition
Work in progress

Issue: SPR-11982