Fixed issue where form-list-column and field-layout nodes in an extended
  screen modified the original node from the base screen
Merged change from Solomon Bessire to add icon attribute to submit element in XML Form, was already supported by macros
Merge remote-tracking branch 'upstream/master'