Merge pull request #840 from andrzej-jankowski/develop

Scan - ssh_cisco_catalyst fix
Merge pull request #841 from andrzej-jankowski/develop

Better Thomas-Krenn detection
version 2.0.0-rc4