COR-340: Test failures and errors with Oracle java >= 1.7.0_25