DDLSHELL-50. Propagate changes from SCHEMA-523.

issue: https://jira.kiji.org/browse/DDLSHELL-50
review: https://review.kiji.org/r/1047