Merge pull request #51 from vmware/development

Merge current develop to Master
Merge remote-tracking branch 'upstream/master' into development
commit 1st pass on vshield_user type|provider