Merged src/core, src/test/core, src/contrib/eclipse-plugin, and src/contrib/ec2 from trunk 776174:784663