Fixes the following issues: http://issues.apache.org/jira/browse/DIREVE-216 http://issues.apache.org/jira/browse/DIRLDAP-47
Changed paths: