/var/lock is wiped on reboot by default, so moved persistent lock files out of there
Merge branch 'development'