smokeping: puppet 3 compatibility fix: module path

Change-Id: Ibc3b6e44f85c89c4e097100d28764424474ddf4b
geoip: puppet 3 compatibility fix: module path

Change-Id: Ib617ac623dfdaed52f74661cc084b89f57e09e0a
Merge "smokeping: puppet 3 compatibility fix: module path" into production
Merge "geoip: puppet 3 compatibility fix: module path" into production