New deployment build, partial fix for bug 71479 and editing properties

also fix for bug 71469

Change-Id: I2b3b6ba574fd09b9610844ba2aa36ef76b920acd