CRM-13083
CRM-12717 Improve title of Miscellaneous system setting menu item and handle in upgrade.

----------------------------------------
* CRM-12717:
  http://issues.civicrm.org/jira/browse/CRM-12717
Merge pull request #1215 from davecivicrm/CRM-12717

CRM-12717 Improve title of Miscellaneous system setting menu item and ha...
fixed for CRM-12995

----------------------------------------
* CRM-12995:
  http://issues.civicrm.org/jira/browse/CRM-12995
Merge pull request #1218 from kurund/CRM-12995

fixed for CRM-12995
Merge pull request #1212 from yashodha/trunk

CRM-13083