Fix bugs found when trying to uplift (uplift to 0.61.x)#1661

Merged

bsclifton merged 1 commit into0.61.xfrom 0.61.x_pr1655_npm-run-pr2

Feb 13, 2019

+45-24

Commits on Feb 13, 2019

Fix bugs found when trying to uplift #1632
bsclifton
committed