Merge proposals dependent on lp:~psusi/ubuntu/vivid/grub-installer/fix-efi-multi-disk-installs

1. Vivid (15.04)
2. fix-efi-multi-disk-installs
3. Dependent merge proposals