Merge "Default DataBroker does not read subtrees from Mountpoint"