Fixes Issue #506, "When I load new Baseline model I still see choice arguments from older Baseline model."

[#57236420]
Merge branch 'origin/develop'
Merge pull request #528 from NREL/20130924_ETH_BugFixes

Fixes Issue #506, "When I load new Baseline model I still see choice arg...
Passed tested described in issue on my mahcine