Don't include fix for GROOVY-6582
Fix GROOVY-6582: Don't bypass getProperty in invokeMethod when looking for Closure-valued properties.
GROOVY-6542: Add line number information to delegated call
GROOVY-6268: splitting logical & bitwise operators, and adding relational operators
Add helper method to ClassNode for safely removing a method.  Tidy up test.
Merge upstream master.
Merge branch 'GROOVY-6585X'
Merge branch 'GROOVY-6582'
Fix tiny javadoc typos.
Use ClassNode.findSAM to find the single abstract method.
Replace fragile test for MethodNode.isScriptBody with a flag.
Use AST node metadata to flag whether a method is a script body implementation.
Fill in the Javadoc for setIsScriptBody().
A little comment tweakage.
Merge branch 'GROOVY-6585X'