Revert removal of bin/tests/system/common/controls.conf, it's still needed