Fix for dhcp missed inside admin net (plus a little refactoring)

Closes-Bug: #1320834

Change-Id: I3137377c7e4386e03d5803d60966ddf59ed05f07
Merge "Fix for dhcp missed inside admin net (plus a little refactoring)"