Added capability of specifying host and keys on commandline
Merge branch 'ftr-commandline-options' into dev