[TASK] Preserve initial value of AOP-introduced properties (Revision 4)

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

Change-Id: I26e28067cb736ac0c6d210a5c1daa03420b7ab78
Releases: master
Revision-Id: a5836d805657fda9ed25cfe300d640a7d0ba8616