Small code fixes and improvements
Merge pull request #1600 from Mirantis/fix/dhcp_code_improvements

Small code fixes and improvements