Merge "TF-A: Fix BL2 bug in dynamic configuration initialisation" into integration