dart: top of tree and 1.7 branch

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>