Merge pull request #1723 from soby-mathew/sm/reset_bl31_fix

FVP: Fixes for RESET_TO_BL31