[TASK] Preserve initial value of AOP-introduced properties

This maintains the initial value of AOP-introduced properties,
if they are other than NULL.

Change-Id: I26e28067cb736ac0c6d210a5c1daa03420b7ab78
Releases: master