SOC-4410 | Fix critical violations in Sonar.
ro injection on 20141003-005036
Revert "SOC-4410 | Fix critical violations in Sonar."

This reverts commit 8e3a967bd44621a432262784094f005c12372efc.
Merge commit '7b09042c378632da318d14d22ac9dadfe3edc9ab' into HEAD