BZ-12892: Updating code format
Merge branch 'RC20140821' into integration