fixes #3268, #2783 - Update prod2dev to handle fkeys in psql

(cherry picked from commit f2cddb6be2e68958350081c72068c79ca26a656b)
fixes #3603 - replaced a relation with a collection in 'where' conditions

(cherry picked from commit 9e08f306472c16c8c019fe7c038b5cb44bd5a28e)

Conflicts:
	app/controllers/puppetclasses_controller.rb
fixes #3645 - fix total value in summary mail subject

(cherry picked from commit c67d0d83ddfb977bffbdaa0c35a9f7ae5aead02c)
Fix #3682: pin rabl to be less than or equal to 0.9.0

(cherry picked from commit 4d916f481b4c89bfcab8816347690c8afd34dd96)
Fixes #3468 - Move token expiry to scope to avoid FK issues

(cherry picked from commit 585f328e6bbe9e8f429ddb2ccc97fb119da959b7)

Conflicts:
	app/models/host/managed.rb
fixes #3698 - add image_id alias to server resource as form uses it

(cherry picked from commit 4f8049c586c066e1fac16825af06249cd46b7242)
fixes #2680 - ensure RbVmomi::VIM::ComputeResource is loaded before our ComputeResource

(cherry picked from commit 58547fc6413965e8491d72eb308e95caa3952dff)
fixes #3832 - foreman supplies user for GCE images, fog expects username

(cherry picked from commit 51908af77554e588e85f7a6f73f1ce3e15aa4157)
fixes #3717 - pin fog to 1.15.x

(cherry picked from commit 4cc18563a29cf2e94e0e1a92dfdae14aea6b97a2)

Conflicts:
	bundler.d/fog.rb
	foreman.spec
Fixes #3653: Always set the vsphere guest_id, as recent versions of fog require it
Fix unresolved conflict in foreman.spec from b03d0a49
fixes #3855 - pin ruby-libvirt to 0.4 for Ruby 1.8 workaround

(cherry picked from commit c6d5131967fdb5ada9956fb9e83079db10ab1c29)
fixes #3661 - mis-redirection from /hosts/fqdn/edit to /hosts

(cherry picked from commit 625e5c7bef437a25c874195e1e1f938ff9ab5e2c)
Fixes #3881: pin locale to 2.0.9 or lower

(cherry picked from commit 5090476799f7f6d8f14749f52973e03a2ef37491)
Release 1.3.2