[ACS44] merge hotfix/4.4-7405

[Sebastien Goasguen]

Daan,

I applied a new patch to hotfix/4.4-7405

Can you merge it to 4.4, it fixes metadata rewrite rules issues, bug 7405.
I already committed it to master.

thanks,

-sebastien