Merge "devicemanager-core refactoring and support for TLS mountpoints using data-provider interface"