Improvement fix for ZF-3187 to support XRDS discovery