Merge remote-tracking branch 'gh/next'

Conflicts:
	src/common/crc32c_intel_fast.c

diff --cc src/common/crc32c_intel_fast.c
index 0532dd261cf024dea3f82cc5b9de8ea2c60530d8,49305088affee8382109d9232db7d83dec51e9be..42338a7bcd41c29ee8358dc308f563c802741218
--- 1/src/common/crc32c_intel_fast.c
--- 2/src/common/crc32c_intel_fast.c
+++ b/src/common/crc32c_intel_fast.c
@@@ -1,6 -1,5 +1,5 @@@
 -#include <inttypes.h>
  #include "acconfig.h"
- 
 +#include "include/int_types.h"
  #include "common/crc32c_intel_baseline.h"
  
  extern unsigned int crc32_iscsi_00(unsigned char const *buffer, int len, unsigned int crc);