Merge pull request #7680 from ceph/wip-da-SCA-20160203

common: various fixes from SCA runs

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <jdillama@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

diff --cc src/cls/rbd/cls_rbd.cc
Simple merge

diff --cc src/journal/JournalMetadata.cc
Simple merge

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

diff --cc src/msg/async/Event.cc
Simple merge

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_op.cc
Simple merge

diff --cc src/rgw/rgw_rados.cc
Simple merge