Merge "[BLACKDUCK] Fix blackduck config"