Nits + BC correctness fixes from 5.x audit (followup to #1072) #710

Job	Run time
testsuite / testsuite-linux (8.3, sqlite, highest, false)	39s
testsuite / testsuite-linux (8.2, pgsql, highest, false)	45s
testsuite / testsuite-linux (8.2, mysql, highest, false)	47s
testsuite / testsuite-linux (8.4, mysql, highest, false)	48s
testsuite / testsuite-linux (8.5, sqlite, highest, false)	24s
cs-stan / Coding Standard & Static Analysis	38s
testsuite / testsuite-linux (8.2, sqlite, lowest, false)	36s
	4m 37s

Provide feedback