Merge branch 'develop' into key-store-refactor

Author: markcowl

src/ScenarioTest.ResourceManager/Constants.cs

@@ -82,6 +82,9 @@ public class Category
         // Windows Azure NRP dev team
         public const string wanrpdev = "wanrpdev";
 
+        //Azure NRP Firewall dev team
+        public const string azurefirewall = "azurefirewall";
+
         // Acceptance type
         public const string AcceptanceType = "AcceptanceType";