[#1846] merge with master
[#1846] merge with master

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