__FreeBSD_version: Bump for mkimg %align feature

MFC after:	1 week
Sponsored by:	Amazon
Differential Revision:	https://reviews.freebsd.org/D60453

(cherry picked from commit 0f787e867d)

Makefile.inc1

@@ -2683,9 +2683,9 @@ ${_bt}-usr.sbin/makefs: ${_bt}-lib/libsbuf
 .endif
 .endif
 
-# 1600027, 1501504: vmdks support
-.if ${BOOTSTRAPPING} < 1501504 || \
-	(${BOOTSTRAPPING} > 1600000 && ${BOOTSTRAPPING} < 1600027) || \
+# 1501505, 1600029: %align support
+.if ${BOOTSTRAPPING} < 1501505 || \
+    (${BOOTSTRAPPING} >= 1600000 && ${BOOTSTRAPPING} < 1600029) || \
 	${MK_DISK_IMAGE_TOOLS_BOOTSTRAP} != "no"
 _mkimg=	usr.bin/mkimg
 ${_bt}-usr.bin/mkimg: ${_bt}-lib/libz

sys/sys/param.h

@@ -74,7 +74,7 @@
  * cannot include sys/param.h and should only be updated here.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1501504
+#define __FreeBSD_version 1501505
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,