fix distributed-process merge conflicts #886
fix distributed-process merge conflicts #886

# Conflicts:
#	build-constraints.yaml

lemol/stackage,k0ral/stackage,GregorySchwartz/stackage,fpco/stackage,agrafix/stackage,simonmichael/stackage,mrkkrp/stackage,judah/stackage,phadej/stackage,Shimuuar/stackage,stackbuilders/stackage,athanclark/stackage,mpickering/stackage,ygale/stackage,l29ah/stackage,fimad/stackage,peti/stackage,phaazon/stackage,meteficha/stackage,christiaanb/stackage,michalkonecny/stackage,iand675/stackage,alanz/stackage,mstksg/stackage,asr/stackage,int-index/stackage,nomeata/stackage,amcphail/stackage,brendanhay/stackage,massysett/stackage,bartavelle/stackage,codedmart/stackage,creichert/stackage,garetxe/stackage,DanielG/stackage,clinty/stackage,jaspervdj/stackage,mgajda/stackage,Gabriel439/stackage,spencerjanssen/stackage,soenkehahn/stackage,jonschoning/stackage,Daniel-Diaz/stackage,ethercrow/stackage,lwm/stackage,marcinmrotek/stackage,wereHamster/stackage