Merge "Assign specific client address to dhcp server" into rvc-dev