Merge "ktlint fixes" into qt-qpr1-dev
am: 34c392a367

Change-Id: I50226b10f8aa5bf3d4714d61bc90f86b60609eee