3980 primary address demotion

Various fixes for bugs in ODE that cause address, phone and email demotions, duplicaiton accross types and other less expected problems.  Bulk of the code is examples that demonstrate the previously untested or poorly tested kinks of the process.