Merge "Bug-731 Fixed few minor Sonar warnings"