Updated Sandy Bridge/extra mask/named umask patchkit

[Andi K. <an...@fi...>]

I addressed all the previous feedback and added the extra checks
Maynard asked for now.

Please apply now.

-Andi