2016-08-16 - production
12:53	<hoo>	Put a better workaround for T132839 in place: Only remove property pairs with context = "item". This keeps ref and qualifier pairs for ext ids intact.	[production]