additional fixes
Merge branch 'oxid_ce_4_7_x' of https://github.com/ratepay/oxid-module into oxid_ce_4_7_x