Merging PR #2598
Merging #2256
CodeStyle
Merge pull request #2804 from Bakual/CodeStyle

Fix CodeStyle Issue with latest commit
$ [31857] Clarify content smart search plugins
Closes #1833
$ Fixing a wrong change in previous commit

Sorry, my fault. That one slipped in wrongly
# [33154] Manifest install sql file with whitespace fails
Close #2800
Merge remote-tracking branch 'upstream/master'