Fixed pluralization, Javadoc, Nullable, and static import stuff.
Merge pull request #1486 from rackspace/1.6.x

Fixed pluralization, Javadoc, Nullable, and static import stuff.