Merge branch 'fix_sortorder_of_picklists_in_customerportal' into 'master'

fix #1136. Order picklists according to sortorder configured by user when passed to customer portal through webservice.

See merge request !349