[Ubuntu14.04: servers reimaged with ubuntu14.04. base OS, has Puppet
agent is in disabled state]

Closes-Bug: #1401432

Issue:
Trusty repo has puppet 3.x > 2.7 which is a part of smgr repo.
As a result puppet from trusty repo gets installed against 2.7.x
Eventhough SMGR repo is before trusty repo in sources.list.

Fix:
Install pupet having the smgr repo alone in the sources.list.
after install of puppet revert the repo to old form.

Testing:
Re-image and provision on Ubuntu 14.0.4

Change-Id: Id8733dbac62cf5eb2c0e9c3ab757ed2b10dc7a97
Merge remote-tracking branch 'upstream/master' into monitoring