Merge branch 'master' into feature/stabilization
PLF-5669:Fix the violations found by Sonar - 2014-W04
PLF-5669:Fix the violations found by Sonar - 2014-W04
PLF-5669:Fix the violations found by Sonar - 2014-W04
Merge remote-tracking branch 'origin/feature/stabilization'