Merge "Fix .classpath for eclipse.  DO NOT MERGE" into jb-dev