Merge "fix MSB-discovery maven docker stage job"