Merge pull request #14 from burnsra/cm-10.1

Cm 10.1
toro: Update props to 4.2.2

Change-Id: Ic1016fafff8f1558fbac252b581e0c19626e4330