Added CustJqp derby dir to gitignore, produced with the automated tests in mantle
Various XML Screen elements have more consistent id behavior with string
  expansion and adding the listEntryIndex suffix, which is now also set
  in section-iterate (in addition to form-list as before)
Merge remote-tracking branch 'upstream/master'