Standardise config reports and fix NPE in battery report
Merge pull request #1669 from cdjackson/zwave-config_updates

Standardise config reports and fix NPE in battery report