Backport fix for Bug 428629 - StructureIterator remove method is broken
to LUNA

Signed-off-by: xinzhao-acutate <xzhao@actuate.com>