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

SDEI fixes