Fix javadoc warning in Combination

Removed import that was only used to attempt to satisfy the javadoc
reference to the class.

Replaced the javadoc reference to an inner class with a fully
qualified reference to the same inner class.
Merge pull request #1020 from MarkEWaite/javadoc-fixes-j

Fix javadoc warning in Combination