Merge branch 'develop' into lxc
lxc: use gen_mac from salt.utils
Merge branch 'develop' into lxc
Merge pull request #7012 from mgwilliams/lxc

lxc: use gen_mac from salt.utils