BUG-731: add curly braces

Automated addition of curly braces.

Change-Id: I475657dc778601124610d0415cdf05e6a4495cc5
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit edb5446f0f917b58f3aab2b42d444d3cc2248417)
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-731: add curly braces" into stable/hydrogen