Puppet feature branching