Backported revisions 26965 and 27004 from branch DBAL_1-0
drwxr-xr-x - typo3