Merge "(bug 45130) Fix siprop=protocols in XML format"