Bug872597 - Fix linting errors present on master branch
Bug 870848 - SSO integration into Popcorn Maker