Updates from local.
Added puppet syntax check.
Merge.