Merge pull request #1283 from jeenu-arm/sdei-fixes

SDEI fixes