Cherry-pick from dev branch introduced unnecessary file but also missed two configurations. This change amends c5378f6cd6 Change-Id: I42bf3cabcd39b4acf8db623a08f52e06f06a6562 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
c5378f6cd6