[#1734] Merge branch 'development' of ssh://code.renci.org/gitroot/e-irods into development
[#1734] Merge branch 'development' of ssh://code.renci.org/gitroot/e-irods into development

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