The upgrade test had duplicated code for checking that daemons were upgraded after the Rook upgrade vs the Ceph upgrade. This is now refactored for consistent checks after upgrade. Signed-off-by: Travis Nielsen <tnielsen@redhat.com>