SCHEMA-782. Fix timeout issues on shutdown and startup

issue: https://jira.kiji.org/browse/SCHEMA-782
review: https://review.kiji.org/r/1860