Merge "fix(zynqmp): move bl31 with DEBUG=1 back to OCM" into integration