fix coverage, include cli module
Merge remote branch 'origin/branch-0.10-gd' into fb-YAHOO-330-branch-0.10-gd