disable profiling for query 1
Merge branch '2.0-maint' into 2.1-maint
renable query 1 profile for 2.1 & 2.2
Merge branch '2.1-maint'