Merge "Fix deploy on failure of subproject"