Fixes #32645 Trailing hyphen is removed in JHTML::_('select.options')
Update cms.php

codestyle
space
[fix][#33893] W3C error validation for template isis on error page. Fixes #3818

See http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=33893&start=0

Update index.php

see : http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=33893&start=0
Merge pull request #3802 from Achal-Aggarwal/fix-32645

Fixes #32645 Trailing hyphen is removed in JHTML::_('select.options')
[fix][33899]Methods declared void must not return a value.
Close #3834
[imp] Update json2.js for Joomla Updater
Close #3848, close #3846
[imp] Change deprecated $app->getCfg() to $app->get() and some CS.
Close #3817, close #3815, close #3814
Codestyle
cs to trigger build
Updated menu.php to fix an issue

As per issue
http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=33584&start=0
Merge pull request #3862 from aditya-did/patch-1

[#33584] Updated menu.php to fix an issue
Merge remote-tracking branch 'upstream/staging' into configConversion