Merge remote-tracking branch 'origin/bugfix/7175-openjdk-7' into testing