Lint fix

Merge fixes to finish ci/cd pipeline onto master

This fixes the last issues with the pipeline (eslint not running correctly due to missing plugins)