Merge pull request #357 from pwieczorkiewicz/remove_statedir

nanny: Remove nanny statedir when nanny is not in use
Merge branch 'master' into testing