From 14d094ccf76dda9c71358c37a6cf95fe24f144fc Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Wed, 18 Feb 2015 13:29:46 -0600
Subject: [PATCH 1/2] Revert "Revert "Added feature flags and license types to
 licenses.""

This reverts commit 5692bbf280f9cf64e5a7c90174595d532510c334.

From 995ae426b8fd744d9c6d079090e7d0aa13a016df Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Wed, 18 Feb 2015 13:31:17 -0600
Subject: [PATCH 2/2] Revert "Revert "Show feature flags and license type in
 /api/v1/config/""

This reverts commit 4a92181a7dd20789f5b5072884b0667dbf653e3a.