bz 1059417,1056892 -- Handle interface names containing "." or "-"

This updates the previous patch to also handle interface names
containing "-".

(cherry picked from commit 8b58329ff874aa1f2c55b55e21c2ec7b459c5d5f)

Conflicts:
	puppet/modules/quickstack/manifests/neutron/networker.pp