[SPARK-4308][SQL] Follow up of #3175 for branch 1.1#3176

liancheng wants to merge 1 commit intoapache:branch-1.1apache/spark:branch-1.1from

liancheng:fix-op-state-for-1.1liancheng/spark:fix-op-state-for-1.1Copy head branch name to clipboard