fixes #6382 - revert name change of 48bit mac address regex to fix discovery
fixes #6410 - update to deep_cloneable 2.0
Merge remote branch 'origin/develop' into develop