Drop generic exception handling for CLI tests

Use the specific CLIFactoryError exception when handling CLI
factories exceptions
Enable CLI Org test_bugzilla_1078866
Merge pull request #1168 from elyezer/drop-generic-exception

Drop generic exception handling for CLI tests