Chase r302145 and increase zfsboot's EFI partition size

Index: usr.sbin/bsdinstall/scripts/zfsboot
===================================================================
--- usr.sbin/bsdinstall/scripts/zfsboot	(revision 305731)
+++ usr.sbin/bsdinstall/scripts/zfsboot	(working copy)
@@ -848,7 +848,7 @@
 
 			f_eval_catch $funcname gpart \
 			             "$GPART_ADD_ALIGN_LABEL_WITH_SIZE" \
-			             "$align_small" efiboot$index efi 800k $disk ||
+			             "$align_small" efiboot$index efi 200m $disk ||
 			             return $FAILURE
 			f_eval_catch $funcname gpart "$GPART_BOOTCODE_PARTONLY" \
 			             /boot/boot1.efifat 1 $disk ||