Fix bug: Dryad's TreeBASE integration crash tomcat
Merge remote-tracking branch 'origin/atmire-1215' into dryad-dev