Backport note:
This backport includes 5f84cf371b19c6aeffd423aa2001be7acd5c9c96 which
fixed the parameter description order.
Conflicts:
manifests/init.pp
manifests/magnum.pp
spec/classes/tempest_magnum_spec.rb
Change-Id: If1fddd56828c93c19499ac8dadb2337b3f2afc46
(cherry picked from commit cd44577546)
(cherry picked from commit d6fa19fa2d)