fix: PropertyIterator.remove should remove properties from both collections in TestElement

This is a fixup to a8317d0

Author: vlsi

src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java

@@ -586,7 +586,7 @@ public void setProperty(String name, long value, long dflt) {
     public PropertyIterator propertyIterator() {
         Map<String, JMeterProperty> propMapConcurrent = this.propMapConcurrent;
         if (propMapConcurrent != null) {
-            return new PropertyIteratorImpl(propMapConcurrent.values());
+            return new PropertyIteratorImpl(this, propMapConcurrent.values());
         }
 
         // TODO: copy the contents of the iterator to avoid ConcurrentModificationException?

src/core/src/main/java/org/apache/jmeter/testelement/property/PropertyIteratorImpl.java

@@ -20,12 +20,21 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.apache.jmeter.testelement.TestElement;
+
 public class PropertyIteratorImpl implements PropertyIterator {
 
-    private final Iterator<JMeterProperty> iter;
+    private final TestElement owner;
+    private final Iterator<? extends JMeterProperty> iter;
+    private String lastPropertyName;
 
     public PropertyIteratorImpl(Collection<JMeterProperty> value) {
-        iter = value.iterator();
+        this(null, value);
+    }
+
+    public PropertyIteratorImpl(TestElement owner, Iterable<? extends JMeterProperty> properties) {
+        this.owner = owner;
+        this.iter = properties.iterator();
     }
 
     /** {@inheritDoc} */
@@ -37,13 +46,21 @@ public boolean hasNext() {
     /** {@inheritDoc} */
     @Override
     public JMeterProperty next() {
-        return iter.next();
+        JMeterProperty last = iter.next();
+        if (owner != null) {
+            lastPropertyName = last.getName();
+        }
+        return last;
     }
 
     /** {@inheritDoc} */
     @Override
     public void remove() {
         iter.remove();
+        if (lastPropertyName != null) {
+            owner.removeProperty(lastPropertyName);
+            lastPropertyName = null;
+        }
     }
 
 }