Circular and Square Concrete Columns Externally Confined by CFRP Composite: Experimental Investigation and Effective Strength Models