added easymock dependency
making icon service uri matching a bit more lax
Merge branch 'master' of git://github.com/geoserver/geoserver