fix for bz972514 - handle cases where gear's server id is not set yet
Merge pull request #2887 from rajatchopra/master

Merged by openshift-bot