Fix puppet-lint warnings about ensure

Fix warning: "ensure found on line but it's not the first attribute"

Change-Id: Iecc0cd4fe267c40fbef9a84ff1da2eaff5aa45a7
Merge "Fix puppet-lint warnings about ensure"
Deprecate classes with hyphens

Puppet does not recommend the use of hyphens in class names.

This change deprecates classes with hyphens and inform the users
to use the new ones. Backward compatibility is preserved.

Change-Id: I4991c956e297d76423a805558d9b6731473a4a51