Fixes #8258 - CR provider errors with correct log level
Fixes #7971 - DHCP hostname commutative conflict fix
Refs #3809 - fix shadowing outer local variables
Merge remote branch 'origin/develop' into develop