Bug 979428: make relabs-puppet2 the only puppet master