Merge "Fix deploy on failure of subproject" into elalto