Fix error in error handling when database "stop" fails - EUCA-9714
Fix harmless "error" logging on instance restore - EUCA-9707
Merge remote-tracking branch 'origin/dev/sjones/EUCA-9707' into maint/4.0/testing
Merge remote-tracking branch 'origin/dev/sjones/EUCA-9714' into maint/4.0/testing