[Merge] ~rbalint/shim/+git/shim:master into ~ubuntu-core-dev/shim/+git/shim:master

[Dimitri John Ledkov]

Previously I numbered patches after pull request, i.e. 359.patch is pr 359 on github.
-- 
https://code.launchpad.net/~rbalint/shim/+git/shim/+merge/401388
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~rbalint/shim/+git/shim:master into ~ubuntu-core-dev/shim/+git/shim:master.