jewel: update props from TheMuppets

to commit: cd6322773a7640e7f97e3ce856beb4a51b70c958

Change-Id: Ia0cb6958ffca3e57f3058c076ee54e921e2045e4
s4-common: update props from TheMuppets

to commit: 6929b0f8cd1a0e5a6c25ef3aac0c2252ddeeeb59

Change-Id: I3e8d967142bae4d901ed2fef55db3ffd8d582962