Merge "Fix discrepancy between command line maven build and the one initiated by...