Revert "Use dist branch in buildcontrol"
Revert "Use dist branch in buildcontrol"

This reverts commit 83245ab1ebfe6c530bb8c0cf74204998120a368b.

Grasia/teem,P2Pvalue/pear2pear,P2Pvalue/pear2pear,Grasia/teem,P2Pvalue/teem,Grasia/teem,P2Pvalue/teem,P2Pvalue/teem