merge back changes rgevaert

fixes problems with bbb-conf --restart not working correctly