core 3966 3965 minor ui fixes for collaborators screen
core 3733 fix partial restore of file/folder
core-3975 show informative error msg
core-3967 core-3947 core-3965 core-3819 fix minor issues collaboration UI
core-3848 move empty trash to right end
core-3944 fix issues with out of date path being submitted to jex when there is a folder rename
Merge branch 'master' of git@github.com:iPlantCollaborativeOpenSource/de-webapp