MARKETING-1763 : Move orchard stomp changes to stomp repository