NOJIRA: Update default wro.xml, which was missing some files added to default html templates.
Merge branch 'ucb-deploy_3.2' into pahma_3.2
PAHMA-688: Add back media title field, but keep it hidden so a default value will be set.