Merge branch 'juerg/junction-aliases' into abderrahim/buildstream-mirrors-merge2