merge from trunk: these open layers resources were not committed!
use local release of OpenLayers api so that it works over https with our secure deployments (openlayers.org does not offer the api from their servers using https).