GRAILS-11163 fix persisting command line history to file
Merge branch '2.3.x' into 2.4.x