Merge "XmlSelect: Fix PHPDoc param comments for addOption() & formatOptions()"