Merge "RESTRICT AUTOMERGE Add code to check for SELECT statements in query" into qt-qpr1-dev am: a0b2fb3cb2

Change-Id: Id893e1508f6e3ff97ebf843b07470d33184a1032