Merge "Increase Java heap space for Maven job"