[patch] fixes for javadoc, collection names and no filer collections

[Kevin O'Neill]

These patches have been placed into bugzilla.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21461
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21462
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21463