make word count query use edismax parser
Merge branch 'master' into RELEASE_20140325