Merge branch 'master' into execwork
Conflicts:
sandbox/prototype/common/src/main/java/org/apache/drill/common/logical/data/Order.java
sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/rops/OrderROP.java
sandbox/prototype/exec/ref/src/main/java/org/apache/drill/exec/ref/rse/QueueRSE.java
sandbox/prototype/sqlparser/src/main/java/org/apache/drill/jdbc/Driver.java
sandbox/prototype/sqlparser/src/main/java/org/apache/drill/optiq/DrillScan.java
