Revert "fix bug 1038777 - keep lock in /var/lock instead of /tmp"
Merge pull request #2207 from mozilla/revert-2202-bug1038777-keep-lock-in-var-lock

Revert "fix bug 1038777 - keep lock in /var/lock instead of /tmp"
Wait for pg_hba to be updated before creating user

Puppet tries to create the postgres test user after postgres has been
initialized, but before pg_hba.conf has been updated and the service
restarted.

Fixes Bug 1038956
Fixes bug 1039648 - Update forced versions for correlations for Firefox cycle starting 2014-07-22
Merge pull request #2208 from bramwelt/fix-1038956-socorro-vagrant-build

Fix 1038956 - Wait for pg_hba to be updated before creating Postgres test user
re-apply fix bug 1038777 - keep lock in /var/lock instead of /tmp

This reverts commit 2d4d12049c3bd9c0c6ef03a36353c5a643b6a1ad.
Merge pull request #2210 from rhelmer/bug1038777-keep-lock-in-var-lock

re-apply fix bug 1038777 - keep lock in /var/lock instead of /tmp
fix bug 1039876 - move socorro.pp to vagrant.pp
Merge pull request #2214 from rhelmer/bug1039876-move-puppet-manifest-for-vagrant

fix bug 1039876 - move socorro.pp to vagrant.pp
newer pyhs2 adding support for a timeout
Merge pull request #2215 from twobraids/pyhs2-with-timeout

Fixes Bug 1037874 - pyhs2 with timeout
followup to bug 1038777 - doc/deploy.sh changes to make new lock directory location clear
Merge pull request #2216 from rhelmer/bug1038777-var-lock-doc-changes

followup to bug 1038777 - doc/deploy.sh changes to make new lock directo...
s/get_key/new_key/  fixed unittests
added missing config requiremens to BotoS3 crashstore
Merge pull request #2218 from twobraids/none-ceph

Fixes Bug 1040249 - Api usage error
replace create with get, keeping create as fallback
Merge pull request #2219 from twobraids/ceph-unsets

Fixes Bug 1040289 - added missing config requiremens to BotoS3 crashstore
Merge pull request #2220 from twobraids/ceph-get-create

Fixes Bug 1040292 - replace create with get, keeping create as fallback
added dump name mangling & test