Fix #10287 network.ip_address don't recognize interfaces with dashes in it's name
Merge branch '10287-fix-dashes-in-interface-names' of git://github.com/dmyerscough/salt into dmyerscough-10287-fix-dashes-in-interface-names

Conflicts:
	salt/utils/network.py