fixed merge errors and warn when REQUIRED properties are unset.
improve logging: set exit code on puppet error, better puppet error handling, better handling of multi-line puppet log entries.