optimized imports
fixed issue with invalid message after setting the fetch size value
Merge branch 'develop' into scala_2.11

* develop:
  fixed issue with invalid message after setting the fetch size value
  optimized imports