Merge pull request #21 from sotty/master

Use 5.5.0.Final in poms
Merge pull request #22 from sotty/master

Align code with grid 5.5.x
Limit the proliferation of Grids to avoid more leaks