Merge latest 4.4.2 changes that were needed so fix POSTs of DBQs with multiple attachments.