Merge "Remove the need for mvn33 defaults"