Fix issue with reports creating invalid URLs when updated.

When updating a report, if the Report Settings is set to "Include Report in
Navigation Menu", the navigation url that is created is formatted like
/civicrm/report/instance/1_reset_1, which is incorrect. The correct URL
should be /civicrm/report/instance/1?reset=1.
Merge pull request #3858 from giant-rabbit/feature/reports-nav-url-fix

Fix issue with reports creating invalid URLs when updated.