[#1862] Merge branch 'master' of github.com:irods/irods
[#1862] Merge branch 'master' of github.com:irods/irods

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