Fixing hardcoded default values.

Change-Id: Ic7c3e487af8ad1d82c9f529976de9efafe0c417f
Merge "Fixing hardcoded default values."
prevent puppet manifest execution with bad puppetmaster value

Change-Id: I6134381b9a44e0a38f81a07b2e73746040bd7a4b