TRUNK-4025, backport liquibase fixes to 1.9.x

@dkayiwa here is the separate request for TRUNK-4025. thanks!