First pass at showing license activating errors. #2133
Additional improvements to the license handler. #2133
Merge branch 'release/2.2' into issue/2133
Merge branch 'issue/2133' into release/2.2