merged BETA_JAVA7 into R3_7_maintenance
175 files changed