Cumulative Fix for GEOS-5698 and GEOS-5215, security GUI bugs