Merge branch 'develop' into deployments

ui/src/cloudCost/tokens.js

@@ -19,7 +19,7 @@ const aggregationOptions = [
   { name: "Provider", value: "provider" },
   { name: "Service ", value: "service" },
   { name: "Category", value: "category" },
-  { name: "item", value: "item" },
+  { name: "Item", value: "item" },
 ];
 
 const costMetricOptions = [

ui/src/components/Header.js

@@ -26,7 +26,7 @@ const Header = (props) => {
   const { title, breadcrumbs } = props;
   const { pathname } = useLocation();
 
-  const headerTitle = pathname === "/cloud" ? "Cloud Cost" : "Cost Allocation";
+  const headerTitle = pathname === "/cloud" ? "Cloud Costs" : "Cost Allocation";
 
   return (
     <div className={classes.root}>