Issue 567

Fixed issues with the update manager
Merge pull request #593 from blackberry/next-567

Issue 567