Remove logic from puppet.conf

We can now use 3.x configuration exclusively. Also we used
$puppet_version which is incorrect, the value is $puppetversion.

Change-Id: I8ddd985d76970ab8937752dd9c2dc6cf4b7d160a
Merge "Remove logic from puppet.conf"