Merge "fix(plat/zynqmp): fix coverity scan warnings" into integration