bugz 4445: limit server actions to appropriate states
Merge pull request #47 from daniellemayne/develop

bugz 4445: limit server actions to appropriate states: develop
bugz 4626: set normal priority shares for cpu and memory
Merge pull request #49 from daniellemayne/develop

bugz 4626: set normal priority shares for cpu and memory: develop
bugz 4628: allow user to specify network at vm launch
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #51 from daniellemayne/develop

bugz 4628: allow user to specify network at vm launch - develop
bugz 4662: fixed NPE
Merge pull request #53 from daniellemayne/develop

bugz 4662: fixed NPE - develop
bugz 4628: networking fix for app network type
Merge pull request #55 from daniellemayne/develop

bugz 4628: networking fix for app network type: develop
bugz 4704: added null check for net config
Merge pull request #57 from daniellemayne/develop

bugz 4704: added null check for net config: develop
bugz 4711: remove hardcoded text from vapp name
fixed variable to avoid potential infinite loop
Merge pull request #60 from daniellemayne/develop

naming convention bug fix: Develop