* Fix idempotency on the init.d removal (when using upstart)
* Bring back the old symlink-the-data-directories code, it's more robust