Added some logging to network manager
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Added support for VNC license as a pass-through arg
Resolved conflicts