QA-5211 - QA-5212 : fix renaming / move issue for file under GIT source control