Bug 436581: Test failure in RenameTests18.testLambda3 and testMethod0-2