hardcode expected log message counts for tests; update do-import-redis /issue #277
fix improper rebase /issue #277
further renaming from /issue #222