Cleanups to error-handling in cmd_feature_import.
Cleanups to error-handling in cmd_feature_import.

===BZ:Fixed=== 635628
===BZ:Fixed=== 673502

willb/configuration-store,willb/configuration-store,getwallaby/wallaby,getwallaby/wallaby