JCR-2288: Align the PR with the fix in the master
JCR-2288: Remove gitignore that has been added by mistake