am 285ee4b3: Merge "Fix .classpath for eclipse.  DO NOT MERGE" into jb-dev

* commit '285ee4b3b009d80683a5188b71ba125dd94e6cf7':
  Fix .classpath for eclipse.  DO NOT MERGE