Merge pull request #9158 from gaye/bug-828287

Bug 828287 - Default to https when no scheme is provided during caldav setup r=lightsofapollo
Bug 853952 - When a user edits and saves an event, return to the app root