Revert 2cf2a83 commit
Revert 'Correct name for fixtures generator'
Revert "Fix merge issue"
Revert "Fix codereview issues"
Revert "Show VLAN name on network validation"