Merging 2.2 code into puppet