Merge "https://bugs.eclipse.org/bugs/show_bug.cgi?id=519666 fix .project file to match org.eclipse.jst.server.generic.modules"