Adding support to nickname on --server option
Merge pull request #614 from fabianofranz/stage

Merged by openshift-bot