JUDDI-867 fixed
JUDDI-868 fixed
JUDDI-865 fixed (again)
JUDDI-869 done