Merge "fix(intel): bl31 overwrite OCRAM configuration" into integration