Merge pull request #1181 from soby-mathew/sm/el3_payload_tzc_permissions