Merge "Fix problem with top level choice elements not being saved correctly. - create common function to process a list of properties and to handle choice correctly - also fixed issued with leaf-list elements and array handling - rift-16326"