Merge branch 'hotfix/#6577-adding-missing-paginator-adapter-plugin-manager-registered-services'

Close #6577
#6435 - minor CS fix (empty newline removal)
Merge branch 'cs/#6435-filesystem-cache-adapter-braces-fix' into develop