Merge "fix(fvp): conditionally increase XLAT and MMAP table entries" into integration