Merge "Write policy file less" into qt-qpr1-dev