Fixes for SmartSantander DeviceDB / EventBroker integration
Merge branch 'develop' into feature/smartsantander