Adding support to nickname on --server option
Merge pull request #613 from fabianofranz/master

Merged by openshift-bot