Merge "Extend Maven opts -Xmx to 8g"