Merge "DcaeLocation : Fixed sonar issue"