Replaced keyfile and certfile in CertificateCredential by a single certfile. Fixes #155.
Merge branch 'develop' of ssh://github.com/NLeSC/octopus into develop