Bug 572734 resolve conflicts if the project is in a subfolder

Change-Id: I8e91c9a3b653db0286f7168e0b330d0bc90d6928
Signed-off-by: MalinaStefaniaStoicanescu <malina.stoicanescu@thalesgroup.com>
3 files changed