bug #4015 Forcing a storage engine for configuration storage
Merge branch 'QA_4_0'