Bumped OpenLayers version. Some cleanup to fit better with JSF