Merged to staging from master

[Mike McGrath]

Just a heads up I did a cleanup of our staging branch (merge from master)
today.  Here's the files that didn't cleanly merge and required some
manual fixing:

#       deleted by them:
../manifests/nodes/sign-vault1.fedora.phx.redhat.com.pp
#       both modified:      fedora-packagedb/manifests/init.pp
#       both modified:      fedora-web/files/syncStatic.sh
#       both modified:      haproxy/files/haproxy.cfg
#       both modified:      mirrormanager/templates/mirrormanager-prod.cfg.erb
#       both added:         transifex/files/70-translation.conf
#       both added:         transifex/files/80-vcs-extras.conf
#       both modified:      transifex/manifests/init.pp
#       both added:         transifex/templates/40-apps.conf.erb

Please verify they are correct in staging.

	-Mike