First part of extension of CRM code to handle different sales channels. More pom stuff to handle Jackson weirdness.