fix dependency and unit test from portal-core sync
Reverting changes to gitignore
fix spring security dependency conflict