Fix to include error message in instance faults

port the patch in 1013350 from Bill Darbie (bill-darbie) into latest code base.

incorporate one little comment from Russell about not specifying the default value twice

added a test case

Fixes bug 1013350

Change-Id: Id61f10bf2502fa57d2d26199ba9608e4566e8624
(cherry picked from commit ce41618c9c24a866ccac19461653eba3b8e6dca4)
Merge "Fix to include error message in instance faults" into stable/folsom