first implementation of reloadconfig
Merge remote-tracking branch 'upstream/master'
restructure the code
fix restarting of arbiter
Merge remote-tracking branch 'upstream/master'
Fix conflicts
Remove missing config import