Merge "configurable logs dir and creation as root"