Cleaned up interfaces inside classes that are visited by the CollectionSetVisitor.
Merge branch 'master' of https://github.com/OpenNMS/opennms