Fix some puppet lint warnings.

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

Change-Id: I9ecd8213c140e51769258c03038082fb98a2bd34
(cherry picked from commit 86868bd15c803e25e249133df91c4e0dcfb2938a)