Fixes for ZEN-7882 total file
Merge remote branch 'upstream/develop' into develop
Merge pull request #17 from ssamartyn/develop

Fixes for ZEN-7882 total file
Fixed ZEN-8975
Merge remote-tracking branch 'upstream/develop' into develop
Merge fix
Updated ZEN-9312, added friendlier message for bad/missing username and password in zenpython if device was added in /Server/Microsoft
Merge remote branch 'vova/develop' into develop
Retain the default behaviour before the zProps were changed
Merge pull request #18 from ssirushchyshyn/develop

Fix for ZEN-8975
Merge remote branch 'vova/develop' into develop
Fixed ZEN-9321 issue