Merged [1504226] and [1504317] from trunk to 0.6 branch.

git-svn-id: https://svn.apache.org/repos/asf/bloodhound/branches/0.6@1504381 13f79535-47bb-0310-9956-ffa450edef68
2 files changed