Merge "bff builds fail due to missing mvn-settings file"