Support for cbdev builds and allow puppet files to be externally included