upgrade/firefly-x: sync from master

Signed-off-by: Sage Weil <sage@redhat.com>
upgrade/dumpling-firefly-x: sync from master

Signed-off-by: Sage Weil <sage@redhat.com>