[#2002] upgrade steps reshuffling
[#2002] upgrade steps reshuffling

leesab/irods,janiheikkinen/irods,leesab/irods,janiheikkinen/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,leesab/irods,leesab/irods,PaulVanSchayck/irods,leesab/irods,PaulVanSchayck/irods,janiheikkinen/irods,janiheikkinen/irods,janiheikkinen/irods,leesab/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,leesab/irods,janiheikkinen/irods,janiheikkinen/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,PaulVanSchayck/irods,janiheikkinen/irods,janiheikkinen/irods