Updating changes with OODT-708

git-svn-id: https://svn.apache.org/repos/asf/oodt/trunk@1602262 13f79535-47bb-0310-9956-ffa450edef68