Merge remote-tracking branch 'origin/wip-4087'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
	src/librbd/LibrbdWriteback.cc

diff --cc src/common/Makefile.am
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/librbd/AioRequest.h
Simple merge

diff --cc src/librbd/LibrbdWriteback.cc
index aee504c81accd1f39ca353f67312bc5a2b624e6d,733e9ec5a95bc0f0656fe41eb7c96fb14dbdc810..dd8f46b87116f02db15f9d797f1a011b29440cca
--- 1/src/librbd/LibrbdWriteback.cc
--- 2/src/librbd/LibrbdWriteback.cc
+++ b/src/librbd/LibrbdWriteback.cc
@@@ -14,7 -15,7 +15,8 @@@
  #include "librbd/ImageCtx.h"
  #include "librbd/internal.h"
  #include "librbd/LibrbdWriteback.h"
 +#include "librbd/AioCompletion.h"
+ #include "librbd/ObjectMap.h"
  
  #include "include/assert.h"
  

diff --cc src/librbd/internal.cc
Simple merge

diff --cc src/test/encoding/types.h
Simple merge