fix unit tests on vagrant
[squash] fix control.php
improve log factory

fixes travis build