Sync merge from trunk



git-svn-id: https://svn.apache.org/repos/asf/bloodhound/branches/bep_0003_multiproduct@1463488 13f79535-47bb-0310-9956-ffa450edef68