This patch fixes issues 441 and 442 in Trac
Fixed generator for replace list item
Fixed geenrate for list append
Change-Id: I6e0365d99b2d555aa0239be53db21748942ddca6