Fix some puppet lint warnings.

Puppet-lint likes the ensure's to come first.

Change-Id: I127ee497d01c7a466338a334a61b47d862d79097
(cherry picked from commit 8f77b5f11c59d77e5091cbf509d92b3b54336370)