Removed the temp work around from subnet module
Merge branch 'master' into rm-subnet-hack

Conflicts:
	robottelo/ui/subnet.py
Merge pull request #572 from kbidarkar/rm-subnet-hack

Removed the temp work around from subnet module