Merge pull request #38 from Juniper/master

merge master to fix
- uniform long options for 'mirror' and 'vxlan'
Merge pull request #39 from Juniper/fix

Fix