Upstream changes
- Merge branch 'feature/subscription-fail-info' into 'master'
- Clean up displaying subscription error info, log more detailed info to the event log.
- Remove unused subscription return code 6
- Escape error content displayed when subscribing fails (as it might contain HTML).
- Show some HTML content as a hover tip when the 'feed URL' returned HTML without feeds.