Merge branch 'codebuild' of github.com:ghostery/ghostery-extension in… …
…to codebuild # Conflicts: # buildspec.yml
