Kracoeus-7002

Merged from mrudulpolus/KRACOEUS-7002.  Not fully functional.  Known issues are described in KRACOEUS-7745.  
Haha! Thats so funny. I was just doing that actually. So yes, that is what thats related to. So what I think we should do in this jira is get rid of the wizard, move to a simple lookup add for the collection into Rolodex. And then spin off another jira to handle adding one from within proposal since that needs to happen through the maint framework and needs more discussion. Do you want to/can you call me?