Improvement fix for ZF-3187 to support XRDS discovery
added test for ZF-3187 improvement fix
Merge pull request #203 from waipeng/master

Improvement fix for ZF-3187 to support XRDS discovery
Merge branch 'hotfix/203'

Close #203

Fixes ZF-3187