Merge "Maven-merge-master fails for BBS-ep component"