Sync up the minor/small changes from Doug's CVS. This will reduce the noise when reviewing the remaining implementation changes. More specifically,

Cleanup:
  javadoc style/consistency
  javadoc example code style
  imports
  whitespace
  uniform serialization method javadoc
  typos

Minor/small impl changes:
  remove redundant null checks
  throw NPE when more efficient
  rework timeouts, lasttime -> deadline
  STPE, make drainTo methods more robust when add throws