change lockfile location to '/tmp' and also add localhost to ALLOWED_HOSTS
Merge branch 'master-patches' into el6-havana-patches