Commissioners vote to keep Confederate war memorial in Hillsborough County, add diversity memorial