Added enhanced options for network configuration.
Revert "Added enhanced options for network configuration."

This reverts commit 48bb5adb5c942b4fe11e6c6e14b97477338fb9e6 and
is moved in to 'networking' branch.
Merge branch 'master' into ansible