Fix nits in nfc_worker and add support to ConfigRequest
Merge branch 'master' of ssh://github.com/svic/mozilla-central into master1

Conflicts:
	dom/system/gonk/nfc_worker.js