common maintenance and update to jdk 7