Merging master into puppet and updating puppet code to Runcible 1.0 architecture