Fix caveats in Maven formulas
SORRY! I got mixed up and I accidentally left bad code in there. Fixed.
Merge branch 'fix_maven2_and_maven30_formulas'