Story in Beijing, Sprint 3 for addressing Sonar Blockers and Criticals.

Please observe following procedure when taking on a Sonar issue to resolve:

• Create a sub-task under this story; provide the link to the Sonar issues in Sub-task
• Assign the issue to yourself in Sonar
• Move Sub-task to InProgress when you start working on issue
• Move Sub-task to Submitted when you submit your Gerrit review (make sure to test locally before you submit)
• Ensure your Gerrit review is accompanied with junit
• Move Sub-task to Delivered and Closed once Gerrit review is merged.