Change to using concat, which also merges puppet and puppet::conf classes, which is not backwards compatible. Bingo! Major version increments.