Updates for Choice_Model components using new interfaces.
Merge branch 'master' of https://github.com/anl-tracc/polaris