Merge pull request #1605 from Kenneth-T-Moore/bench

Fix for bug where objective was deleted during component replace.
another bug
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bench