Restore $dbh removed in afadbca, needed for later query
Merge branch '4.0.15-releng' into 4.0-trunk