Bug 838009 - fixes for change to 'sdcard' devicestorage. r=asuth

- test fix where we checked the device storage in use
- secret debug logging fix

I'm doing these as review fix-ups.