Use common doctest_dropdb

review2151002
Remove dependency on lines from journal.

review2351003
issue3555
Merge