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

Job	Run time
cs-stan / Coding Standard & Static Analysis	42s
testsuite / testsuite-linux (8.2, sqlite, lowest, false)	25s
testsuite / testsuite-linux (8.4, mysql, highest, false)	41s
testsuite / testsuite-linux (8.3, sqlite, highest, false)	32s
testsuite / testsuite-linux (8.2, pgsql, highest, false)	44s
testsuite / testsuite-linux (8.2, mysql, highest, false)	48s
testsuite / testsuite-linux (8.5, sqlite, highest, false)	27s
	4m 19s

Provide feedback