os-147 Sanitize version number once again in this puppet module
Merge branch 'master' into os-137-mgl-evaluate-contrail-2.0