Merge "Fix target branch for pbr and diskimage-builder"