Merge "Fix TimeUtils.formatDuration for exactly one of a unit"