diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi
index 270da8ebb41b..97c9d5032f27 100644
--- a/setup/azurecmdfiles.wxi
+++ b/setup/azurecmdfiles.wxi
@@ -11,15 +11,15 @@
                         <Component Id="cmpCC0D4240D3640D2D425852E0F2A4D31E" Guid="*">
                             <File Id="fil12F99A3166EFE4DC83A3FA8C7EBCF53F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Azure.Storage\AzureStorageStartup.ps1" />
                         </Component>
-                        <Component Id="cmpE4F8CD6FE516185BE62F13CFAFE3AB51" Guid="*">
-                            <File Id="fil9B489707A6B444485AF553AFA714815A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Azure.Storage\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp658F4F28B5894F240AF3AE214E228C7A" Guid="*">
                             <File Id="fil73B16246DA5417876E50086E40C8A00A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Azure.Storage\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpBE01F246267602912E7BB7FAC7C89B62" Guid="*">
                             <File Id="fil53EA2336A844B6FEB7D66B63B476FA61" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Azure.Storage\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp78A25B9098BAB46687796EF93BE6DBD2" Guid="*">
+                            <File Id="filA35C363CDBC5177E191FB4D6F4ED72FB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Azure.Storage\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp8442839E6CCDD8A283EF37DF080C3AE1" Guid="*">
                             <File Id="fil9777FA5CC29A9D86A21E3A77C0D6D0FD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Azure.Storage\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -127,9 +127,6 @@
                         <Component Id="cmp5FB922E1DB9224DAB3732AEA3ECC0388" Guid="*">
                             <File Id="fil5213407D51829D166CAC13B03BB3E5D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\AzureRM.ApiManagement.psd1" />
                         </Component>
-                        <Component Id="cmp98E6818F4D0081B33A02BF17EA784266" Guid="*">
-                            <File Id="fil7320D38A517DBFCD8CE8E4D791C88081" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp2E3A58C9336220FF001B6912E569A1C3" Guid="*">
                             <File Id="filD034D5A928D036FF53840BB6DEC0C538" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\Hyak.Common.dll" />
                         </Component>
@@ -148,6 +145,9 @@
                         <Component Id="cmp4FF21ED4EA95D39B116D37EBAA6A7A91" Guid="*">
                             <File Id="filE6803243875198324657836FA512BC64" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.xml" />
                         </Component>
+                        <Component Id="cmpE03B0B26C7631EC198C4AE91E98F5F70" Guid="*">
+                            <File Id="fil8A683334F988A489C7BC2A890B90D4E3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp481E0B9DF760B9DDFCCCA4BF40106827" Guid="*">
                             <File Id="fil318848DBC3059DFA992E80D067CF83B2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -231,15 +231,15 @@
                         <Component Id="cmpE48A93B0493B28E942E948BA2D821B91" Guid="*">
                             <File Id="fil6502A76962642CDBF1F41647817A0DF2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Automation\AzureRM.Automation.psd1" />
                         </Component>
-                        <Component Id="cmpF61DDA24C5B3FA835259E6ED1E6F310A" Guid="*">
-                            <File Id="fil0A0E06E4EB2486F30BDEB3F328CBA260" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Automation\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp41036154EE783BC3DEFB1A4C67DC0771" Guid="*">
                             <File Id="fil92735F71CDEED7BAC406572675F7E65B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Automation\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp698928A59E1578478BA71B24902667A3" Guid="*">
                             <File Id="fil2A0C02971E77D168780058AFB4955ACE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Automation\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp6516C3983997DABDCD7844B6B6F10F2F" Guid="*">
+                            <File Id="fil2178B6AC371CC4D2C15C391C5136328F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Automation\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp46AB67763AA4CB2288EC5BCF65A0B426" Guid="*">
                             <File Id="fil00B89E18D72F56CA506D015902976259" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Automation\Microsoft.Azure.Commands.ResourceManager.Automation.dll" />
                         </Component>
@@ -299,15 +299,15 @@
                         <Component Id="cmp503CF348442C9E12C3AF1C6110A5AE6F" Guid="*">
                             <File Id="fil31FC04A7A6A66D130D83C8F400B07BC5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\AzureRM.AzureStackAdmin.psd1" />
                         </Component>
-                        <Component Id="cmpF05AC81E437624D7938CC45B54E13E27" Guid="*">
-                            <File Id="fil366796B870DF013DCACD1C44E4156204" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpC412B85F27935BA89ABA93BEB7BBB52D" Guid="*">
                             <File Id="filD036B9290D0C6DCE3BFF869D1B911251" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp8797CC865D183718D54EB25354B5E2E4" Guid="*">
                             <File Id="fil61CF4C4224D43E093959F49C86524EC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp341162180BF390CE2A96709D6793E79A" Guid="*">
+                            <File Id="fil4B340F83C250866273F5EFF4A548802F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpD0EF8A0F8719C6D155CF9683A6832BD9" Guid="*">
                             <File Id="filD7B4161DA28BAC0E88B2F4FF60C4CD76" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -364,15 +364,15 @@
                         <Component Id="cmp613FC7082DD4AE634B8DADCFF3516FB5" Guid="*">
                             <File Id="filC9E1E04075F62F0EC70A11C68DD4C754" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackStorage\AzureRM.AzureStackStorage.psd1" />
                         </Component>
-                        <Component Id="cmpB53781A73EF6C30C97086FD241F47728" Guid="*">
-                            <File Id="filFD80162632CDAC49578D4F0490A9D2D3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackStorage\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp7665E867DBFD0D6117D6F85080B67751" Guid="*">
                             <File Id="fil8AB5DD9620B5A647FF561C797AF298BC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackStorage\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp510B79C102392B6AE4DD103F810E787B" Guid="*">
                             <File Id="fil286CD0D27574584B6FA4F940B29CFF85" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackStorage\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp9ED8706300C8CFD17C8CB62730F15BDA" Guid="*">
+                            <File Id="fil5288D78B57719054D2775BC89792069F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackStorage\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpF59DACE5A099A1224C2EBE519139EA1B" Guid="*">
                             <File Id="fil1E856425087E9F8628785419EBD1E1A4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackStorage\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -441,9 +441,6 @@
                         <Component Id="cmp235245AE05B9E5ED010EE787C63217C5" Guid="*">
                             <File Id="fil92AEB9045BAD0D90DAA8519E8E7AA02F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Backup\AzureRM.Backup.psd1" />
                         </Component>
-                        <Component Id="cmpB63C082415364C220A3484FE813E5C2B" Guid="*">
-                            <File Id="filB6959EA18937B6582F07F270021AC9BD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Backup\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpE0B0C8ED8BBFFD0F88A2D61AB9984AB2" Guid="*">
                             <File Id="filEB90EBDA511597D2A620D5E8A6C5E4A1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Backup\Hyak.Common.dll" />
                         </Component>
@@ -459,6 +456,9 @@
                         <Component Id="cmp88D8EC51D9872B77C8335E8063852E25" Guid="*">
                             <File Id="fil21FE9DBC840AF6B7F32D28ED50FEC7A3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Backup\Microsoft.Azure.Commands.AzureBackup.format.ps1xml" />
                         </Component>
+                        <Component Id="cmp8D65B0DCF18B0EA7A63591EBC70C510A" Guid="*">
+                            <File Id="fil8ADC24E9EE79593667376ED21643498A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Backup\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp12F7010B33D1FFDE1CA3DEF2102C85D3" Guid="*">
                             <File Id="fil48DC71962E8922A3C31FE88FEFBCD198" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Backup\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -524,9 +524,6 @@
                         <Component Id="cmp8D6E468747E93CD69A8E2A0D608759F8" Guid="*">
                             <File Id="filEE17F3DDF5BFABA60A722D22EA85B73B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\AzureRM.Batch.psd1" />
                         </Component>
-                        <Component Id="cmp5F72E6720B7BBE3CBED99E9161EF739A" Guid="*">
-                            <File Id="filDF4C9D555702E7AE90814BDA72E8DCD0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp6F14BB2DCB8DCC909D5FEA84EB6E7301" Guid="*">
                             <File Id="fil557C1294418461564FC95ADE506F4C11" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Hyak.Common.dll" />
                         </Component>
@@ -545,6 +542,9 @@
                         <Component Id="cmpA2DFBBC7C1D2551CE1820D4BFE68DD25" Guid="*">
                             <File Id="fil268AD608D66E72195028252C834DB7B6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Azure.Commands.Batch.format.ps1xml" />
                         </Component>
+                        <Component Id="cmp4A6F96C22730818C662DA09055154FE0" Guid="*">
+                            <File Id="filF913F2E96D8657C45E36DEA658C2FE62" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp863C865281BE4875E207BF573BB434C8" Guid="*">
                             <File Id="fil9E3CC2E27FE4D70FB938AE8D2471AEC7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -646,15 +646,15 @@
                         <Component Id="cmpE2DA894B67E7F107B24A69AD6B87F8B3" Guid="*">
                             <File Id="fil6EA712045B160BE36B4A3D2068D50F9F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\CheckVersions.ps1" />
                         </Component>
-                        <Component Id="cmpCEDC2B2DC31F9DE886EDC886A6DC8BDB" Guid="*">
-                            <File Id="fil0C40C09AAEB101325624EE65B9193E00" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpCC409403AF670A9E0538AC743C61BD66" Guid="*">
                             <File Id="fil68CB35902CE5A11BE50C9DE228B61D12" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp8F649774D57C8E90EC765D8FCE36E32A" Guid="*">
                             <File Id="fil73B5CA29800DCB502BFE9BEE1925F137" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp97D0BCD046DCE5E1A3DA3611DDBA27AB" Guid="*">
+                            <File Id="fil5929DE23F5BCB4DF606D6C036ECB495E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpFBB75A5451448B356C97E62D2C6C10A0" Guid="*">
                             <File Id="fil24BE7D514EE83ED7D31C68CBFFA8FBB8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Microsoft.Azure.Commands.Compute.dll" />
                         </Component>
@@ -822,15 +822,15 @@
                         <Component Id="cmp75C3D72B9C46E1B9D3F51CE3D29F6F00" Guid="*">
                             <File Id="fil5CCF53246801A602FA558B5E387C8477" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataFactories\AzureRM.DataFactories.psd1" />
                         </Component>
-                        <Component Id="cmp786E1B0FECBA216B39D8366C901B0412" Guid="*">
-                            <File Id="fil25C3A9BA2BA6AC6444F949401433738E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataFactories\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpEEBCE6D5D00306CCD759CE5B7793B164" Guid="*">
                             <File Id="fil75D801F6F3218A4C6EC391F60B15E13D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataFactories\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpEA6F740D378DB99E31F7433B8C57865A" Guid="*">
                             <File Id="fil0877E7F30FEFCFC432E6264D845E5C81" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataFactories\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmpD3E3F0EC28639F2167A80B2CFFA48D3A" Guid="*">
+                            <File Id="fil5D871E02419C2606947475147CCAC790" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataFactories\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp7426DB42CCB21FE78D19972725B67108" Guid="*">
                             <File Id="filF6758468999ADDC12AEF3A0824963E11" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataFactories\Microsoft.Azure.Commands.DataFactories.dll" />
                         </Component>
@@ -917,15 +917,15 @@
                         <Component Id="cmp9AA4CD4105408D3F4F12949A1C0940D1" Guid="*">
                             <File Id="filCC59772EC4CF0F1A839EEE7F778FC1DD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\AzureRM.DataLakeAnalytics.psd1" />
                         </Component>
-                        <Component Id="cmp7D0C86492816C6DBCBCE8A7CEF4458C7" Guid="*">
-                            <File Id="filDADBB907BDB5BCC4A5C7ABD5ED3876EF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp70A49156E2EDA72CDD86623D5D7012CA" Guid="*">
                             <File Id="filCD028A52562D61578EF8722308CEF55B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp2FEEAA23FF0F261C6E47AB598DBBF8A6" Guid="*">
                             <File Id="fil0EC81C67A30E3471F06DBBCB28FCA712" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp2724FFAE2E4148D8281FED1A2B986135" Guid="*">
+                            <File Id="filCBA78478EC0E5DDF953CE339669D9580" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp5835D87A5A94F44EAAAE61BCA33C1D80" Guid="*">
                             <File Id="filEC64A002E6CBA598F7148F816DB05F11" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.DataLakeAnalytics.dll" />
                         </Component>
@@ -997,15 +997,15 @@
                         <Component Id="cmp1626D75E4A091FD36D772FB1DEAEF2E9" Guid="*">
                             <File Id="fil6DCF5300A481ECBF92B70405D1D3E4F1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\AzureRM.DataLakeStore.psd1" />
                         </Component>
-                        <Component Id="cmpA03D8395C7802788B3FC5C5F08929C98" Guid="*">
-                            <File Id="fil1D97D8A6ECE34526D3F50E0A65FEA863" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpDB37FD2F23B17651F12F7CBA5E841363" Guid="*">
                             <File Id="fil3207D6A2378983202DB5EB72D67F6A7B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpFA06C9BD3FF76E0DAA7ACE5C9435F394" Guid="*">
                             <File Id="fil749C103261D59BCB9C100F0716BFBF39" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp198EEB211792E85743513C6C91F89DE2" Guid="*">
+                            <File Id="fil20B72481E90FB3876656B96D574D610E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp5014A98086549EE22F2F2DF9C7C1B1F2" Guid="*">
                             <File Id="filECB31473DDB8F3F534163169ABBEC69D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStore.dll" />
                         </Component>
@@ -1083,15 +1083,15 @@
                         <Component Id="cmp9AADE49B40AE34E78613184F68A0C602" Guid="*">
                             <File Id="fil5AFFA067445601F0E5824F4B710AB29C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\AzureRM.Tags.psd1" />
                         </Component>
-                        <Component Id="cmpAE1758E89597D9566362D317E9DADF3A" Guid="*">
-                            <File Id="filCC01E7E7935EE097C195162539609CDF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp6739EA963462CB23B33E80066E3DDCF1" Guid="*">
                             <File Id="fil3F7357EEDD5CC0978F038B8EC634A479" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp7EAAC8C6FB9DA70F1A7DFE4D980EA958" Guid="*">
                             <File Id="fil81144F5909BCF9AA784915F77B4473E8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp4CF3FA0E57E11971867996EC168DCF85" Guid="*">
+                            <File Id="fil86090D93148CC9E2C249BE6A57EB602F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp4A6F5276FA9D06F16F5CD389241BFB30" Guid="*">
                             <File Id="filF2A3135C52F3A4C055D8CCD04BC9BF5E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\Microsoft.Azure.Commands.Dns.dll" />
                         </Component>
@@ -1169,15 +1169,15 @@
                         <Component Id="cmp9D190B38C7D3A893B21DFAB4A757C98B" Guid="*">
                             <File Id="fil6D6A1AC9F4C45D3DCD408FC684D49FCB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\AzureRM.HDInsight.psd1" />
                         </Component>
-                        <Component Id="cmp4BE2C813032AB544957FEA0A49C2ED8A" Guid="*">
-                            <File Id="fil543B656076B0CEE51C82D4F4246321AD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp04AE56BE6D07E336F237E3D542B1F69D" Guid="*">
                             <File Id="fil49F3436E8B3C323C5F8F216BD1A6924D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp6808C337F61F07015FF34B00DDA3D4E7" Guid="*">
                             <File Id="filFF4C3127B00018E3BCE8E3643F194C5D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp4D76DB745CF6F307B2EFAAA66F450FFD" Guid="*">
+                            <File Id="fil217E2FCA0105D8F2E479B59D126CD551" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp46A49A4018A91E57DC174499B96727A1" Guid="*">
                             <File Id="filCC9EE5E169EB1A801B93374C7BFE0FD7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Commands.HDInsight.dll" />
                         </Component>
@@ -1255,15 +1255,15 @@
                         <Component Id="cmp46D2B2B0B3583E9D988E8822E4019690" Guid="*">
                             <File Id="fil5087BEC8443CA1E4FF406E6BA37FA080" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\AzureRM.Insights.psd1" />
                         </Component>
-                        <Component Id="cmpA68CC036FAA9FC24A6BD990C44FC5520" Guid="*">
-                            <File Id="filB6B13B8CCEB18F4B9656ACC2A9EDF2D6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpBAC33A5E24A63A1AA3FA603EC25BA196" Guid="*">
                             <File Id="fil67DF23056261AFE0ED5D75CFE59309B0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp183CE3EAEAA01DB989815CD9E22E1975" Guid="*">
                             <File Id="fil30238B8FE3588792154F9B00B1FCFA79" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp83C0F1BC40C81FA65D037B344F79178F" Guid="*">
+                            <File Id="fil94AC7EC23D8D99A86CEAED43C4D24C9C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp20A05509BD755C1EF519D072611A0E0F" Guid="*">
                             <File Id="filCD8BD34DB253C69888149817F6571047" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.Commands.Insights.dll" />
                         </Component>
@@ -1341,9 +1341,6 @@
                         <Component Id="cmp007494D6DDD084F46271414EDBAE4A28" Guid="*">
                             <File Id="fil695AE425CF97129CE83CA33285F0759E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\AzureRM.Tags.psd1" />
                         </Component>
-                        <Component Id="cmpEC94F13AD694C2832852C2930006B2BF" Guid="*">
-                            <File Id="filFACCBF854D0FF13B3710E17FEF100D7B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpF892ECD9E56A470DCBCDFB5721EFD871" Guid="*">
                             <File Id="filF2D6D4D9B900B65C391B70657FBF2B18" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Hyak.Common.dll" />
                         </Component>
@@ -1353,6 +1350,9 @@
                         <Component Id="cmpBCA648A3B7B30300ACDCC83746172368" Guid="*">
                             <File Id="filD64CE679433518D6F65696BBFB22C420" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Azure.ActiveDirectory.GraphClient.dll" />
                         </Component>
+                        <Component Id="cmp57CB23DBCAC7D99E3B2A49BF7070C62D" Guid="*">
+                            <File Id="fil8829F35FA0A7C28F0BC9B6AF21194BA0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpDBE0EFA9AB2C3936D498914505FD59BD" Guid="*">
                             <File Id="fil0EDC9091229822DEF09EFE500F63B7AC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Azure.Commands.KeyVault.dll" />
                         </Component>
@@ -1478,15 +1478,15 @@
                         <Component Id="cmp0362FE47213976940F462CA25B10B16B" Guid="*">
                             <File Id="fil1677E33E595C97262C2CD1E8CF4AFC1A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\AzureRM.Tags.psd1" />
                         </Component>
-                        <Component Id="cmp21C38E11DDBAC691295B44F1F98B54F2" Guid="*">
-                            <File Id="fil611623290E8C8F4DE9E00A3DA85B7764" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpE90AEEBC9A23169D337CEEA1678D742C" Guid="*">
                             <File Id="fil53C29F808E3CC54DAC26DD6E2814D262" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpD5EA0B883838D180379E0B369B8FE404" Guid="*">
                             <File Id="filED22F5880321049933BEE30CD42B08EE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmpD44DD9B02C4DB830D51107F822C33873" Guid="*">
+                            <File Id="fil43E83805CC42AFDAD7D681D85DBD8BAB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpC0463AC44CFB7B9988043DDFA5C641DC" Guid="*">
                             <File Id="filD0AE5AA7831757A0D59E6465EC9939D7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.LogicApp\Microsoft.Azure.Commands.LogicApp.dll" />
                         </Component>
@@ -1609,15 +1609,15 @@
                         <Component Id="cmp065EDC002BB63B6AA573F18152B7240F" Guid="*">
                             <File Id="fil559CC58FC4CFCF2A101739440A55FBC7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\CheckVersions.ps1" />
                         </Component>
-                        <Component Id="cmp62E03EDC12116BA9909F21AE9E146689" Guid="*">
-                            <File Id="filF2DB72931487E76556A9737A271860EE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp02E49F28BB0FA3174A478847B857A4D0" Guid="*">
                             <File Id="fil379E46A4E79152D00FBBBF3BF85A0BA2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp53B7AE5C484C188098FEE906B381461C" Guid="*">
                             <File Id="filFA7C341B99CE3AA94C4EF081BBFD8730" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp246D81BDC7381CDCA512555564D15DF8" Guid="*">
+                            <File Id="filD15919432BB51FCBA4315BC079DBEA3E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpFCCC1C3A49857F9109FEB6AE04888D08" Guid="*">
                             <File Id="fil430B05F62A28C317095E53170D8C7803" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Network\Microsoft.Azure.Commands.Network.dll" />
                         </Component>
@@ -1746,15 +1746,15 @@
                         <Component Id="cmpDAB75931F4DB7BCDDF30F7CEF8F61FB5" Guid="*">
                             <File Id="filC5D354ECC7A748ED0855E7BD68F5BBF5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\AzureRM.NotificationHubs.psd1" />
                         </Component>
-                        <Component Id="cmpB347361B53ABCEC9F8025902EF3C6B9D" Guid="*">
-                            <File Id="fil09003F4CA3886FBD4CB5EC708DAE94BE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp8684AA425BD610EEC2F15925581BF893" Guid="*">
                             <File Id="fil0C01002B0A06823ADCED1A7EF2F9153D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp056C8B4C8FE7271CEC0AD4AD7AAB3018" Guid="*">
                             <File Id="fil4F3A2BE47300247FDD2F612BE45B8C43" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp1DAF444CC3ACB5049A7BFC352270E40A" Guid="*">
+                            <File Id="filEC10985FD98FA7CC19D7715448EAC85B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpB5106B48E2EB7B701A40C3B0D8FA0A2E" Guid="*">
                             <File Id="fil4D2A80BCF0E4602A018B991AC888DEF5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.NotificationHubs\Microsoft.Azure.Commands.NotificationHubs.dll" />
                         </Component>
@@ -1811,15 +1811,15 @@
                         <Component Id="cmp17459EC3296F82D03FEF8C426C8DA7EA" Guid="*">
                             <File Id="filF30732FD3174ABEC7D2103467F25E8E5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\AzureRM.OperationalInsights.psd1" />
                         </Component>
-                        <Component Id="cmp7E2625E50BA6384A7DB23547D884D8EF" Guid="*">
-                            <File Id="fil62E3F6DE50B576BD8C264F94F87C75D8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp7CE9821E11931CE1140ACA06CF2D38B4" Guid="*">
                             <File Id="filD490745C6F4007A53448F93D7655F3D4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp6D68CAF3787D43356F3C2CB592699D2D" Guid="*">
                             <File Id="filC9EBF7954395B14810C543D58A25BBBB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp20FBC1203D91D529F69E519C9C2F78B8" Guid="*">
+                            <File Id="filD0082C1A39AE38B3391350DBF48A9B14" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp200DDA39E5F438CD8F080DA375764D0C" Guid="*">
                             <File Id="filCCA44F967EB43DA48C76F7B06F15F056" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\Microsoft.Azure.Commands.OperationalInsights.dll" />
                         </Component>
@@ -1891,15 +1891,15 @@
                         <Component Id="cmp9002DD73D47754F2109499247914700F" Guid="*">
                             <File Id="filA918B8D44812C6306881A86655EAA785" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\CheckVersions.ps1" />
                         </Component>
-                        <Component Id="cmp598FE09226C5E30DF4B7EC0527F5E1EA" Guid="*">
-                            <File Id="filE18B9F75968B19B6CB0B63598D9C139E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpD738842B230F04E64FD98E3E850E6338" Guid="*">
                             <File Id="fil73F9971478A8661859398F414D5BDE00" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp2BE62623A92CD0986F0915CB16373E90" Guid="*">
                             <File Id="filC3230C546BB0518A51FCB03980B8E264" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp95E80D6E42ED3C994C89564D15A4E501" Guid="*">
+                            <File Id="filE637A0F1C5F4038A2B83AB4B481F63A6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpCBBCCDE16C2F179A9160E366F5449CF4" Guid="*">
                             <File Id="fil52A17DB01DCD13C2E571A99347CD7F06" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Profile\Microsoft.Azure.Commands.Profile.dll" />
                         </Component>
@@ -1962,15 +1962,15 @@
                         <Component Id="cmpC96DAF4A31F86D19246E39394F496F83" Guid="*">
                             <File Id="fil2D7BE7247B4B446F4AF0DD4322F0D374" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\AzureRM.RecoveryServices.psd1" />
                         </Component>
-                        <Component Id="cmp3F34A4D3F22CC8AA99DD553E7DEC3AB5" Guid="*">
-                            <File Id="fil9D1D2EDCD3199D2C17081ABCA7A8D4F5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpA77D5875EABE5151973A245C04E3858E" Guid="*">
                             <File Id="fil1D8C96CE85AC990C98123BA88257BC6F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpEDB84317615898A496C0FF620B372C87" Guid="*">
                             <File Id="fil56F72CE4FFC9F006CE1B279238995FC8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp91C07F114413AEF46868515C7011816D" Guid="*">
+                            <File Id="fil8899553ACCBF06231F8DB942402DCC26" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp5CAA968EE7C749E4480233FD90EDFE63" Guid="*">
                             <File Id="filC143DADE40E067E4692D2246F93BA8A4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.ARM.dll" />
                         </Component>
@@ -2030,15 +2030,15 @@
                         <Component Id="cmp301F9E8FA547D7C9A0DF4FF20F87815D" Guid="*">
                             <File Id="fil1A611C57F01D0929B21DD9483DAF7EE0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\AzureRM.RedisCache.psd1" />
                         </Component>
-                        <Component Id="cmp92855C969A6098F84BD25264461325FF" Guid="*">
-                            <File Id="filE33A0322E1153403C1BDD53A6200EBD1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp5EF3051C386C8DAA602E772A7C258726" Guid="*">
                             <File Id="filD9819C68A365E06BAE135F69762CECD5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpD143AF1A4E05D7D8425777ECA2F5440D" Guid="*">
                             <File Id="filF384B88E5C63070E719A146B39F862AC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp607D3E4AA3A57518DD04E360E5BADB1A" Guid="*">
+                            <File Id="filA5516B0AE39D81A707FA585D03D7DC9D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpC546D62FCE2A69288747825E8944417D" Guid="*">
                             <File Id="fil963D2C8A834908FA452EBB05996E2E86" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Azure.Commands.RedisCache.dll" />
                         </Component>
@@ -2128,15 +2128,15 @@
                         <Component Id="cmpE3F8AFED4B05B18FC4A7CAB87B1CB417" Guid="*">
                             <File Id="fil89D429F47E4E159AC3690771E112BF11" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1" />
                         </Component>
-                        <Component Id="cmp9DEA7D0FDA207CBAD89728665D1BF0BD" Guid="*">
-                            <File Id="filC9E9299B4A3CD8AA19E09D4779B2A655" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Resources\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpB3DCE82FE478526DDF1700692DBA9623" Guid="*">
                             <File Id="fil56D69E31585C3BFC03017901E6F3751B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Resources\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpA83327F7CCE4FB576DFC29FAB7F39D59" Guid="*">
                             <File Id="fil7FAE9D5ED90D29EE038563FA6AA30C7A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp9922F56B13A3FABD0F19E738D0175735" Guid="*">
+                            <File Id="fil3D619FC0B255A96FB1993968A32BB952" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp0C4C37E15F9F4671DEFA34F55D2FC9A8" Guid="*">
                             <File Id="filEF8D17B91B6196EF35415DD97DFC0A5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll" />
                         </Component>
@@ -2229,15 +2229,15 @@
                         <Component Id="cmpE1FBC775E0C4E8ECA1EB6C0F338FEDFA" Guid="*">
                             <File Id="fil23111926C8CD47148FFAC879CF352381" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\AzureRM.SiteRecovery.psd1" />
                         </Component>
-                        <Component Id="cmp6AA687D723EA1914F546093B564BF268" Guid="*">
-                            <File Id="fil3BB97EF69EABF98F049988044C3DB2A9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp02DCD4998B3C2CF365F95C5A38848DB3" Guid="*">
                             <File Id="filE4201A82491CB56C78D5CD69110836F3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpCF891519A685521085AC294E4B891DD2" Guid="*">
                             <File Id="fil844E036B9E7913B0123C6D9E4A397BB8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp12478F787751D3B92FA94F4344630D35" Guid="*">
+                            <File Id="filEB8419810E7B7A191264E7C0DE18D624" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp0FD8A30BE2A6216F0F741F6A28419061" Guid="*">
                             <File Id="fil4173A564F0762C8807708D4F0174C842" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -2306,15 +2306,15 @@
                         <Component Id="cmp5C61554BD83089367CC25D6B8087BA72" Guid="*">
                             <File Id="filD5C0E93A081B06910B6A92666C0F0015" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\AzureRM.Tags.psd1" />
                         </Component>
-                        <Component Id="cmpD6846566F91A9E01DBDE45562A50897E" Guid="*">
-                            <File Id="fil05501AC4FFADFC6BC28DA95BE6BC2421" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp3C9C507DDA08AF33411AE879EDD0A4F2" Guid="*">
                             <File Id="fil1DE24B7291B8224F71A972C8F4B92FBA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp1F33CAEBDF996E2FAB3DB353F78D07B4" Guid="*">
                             <File Id="filBF522033C0BE680B8EE62A7BB322BF0E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp40B79E2AA2DCD4CDE491C95D1DC7C56E" Guid="*">
+                            <File Id="fil5BB0A303CD77C6E29A5168E960AD4E22" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp7A202BA2C4E53ABAB23813D24FC94A74" Guid="*">
                             <File Id="filE3970381AF2028C3F1C58921EA2F68B5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Sql\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll" />
                         </Component>
@@ -2449,15 +2449,15 @@
                         <Component Id="cmp926FBB377170F25C198A076240F70BB6" Guid="*">
                             <File Id="fil86F44ED2D5DDF21D04100689B8B278E8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\AzureRM.Tags.psd1" />
                         </Component>
-                        <Component Id="cmp4150E9A91672E4011EF7F410323B0405" Guid="*">
-                            <File Id="fil12C6F854D02BB176C8316FB33B82496F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp59441725CC89648B8BF9D5D4B503100A" Guid="*">
                             <File Id="filBBE725164A1B7199005BA384E6A1BC26" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpBCE3E3885799B8A3163ACE2AE0F576E9" Guid="*">
                             <File Id="fil2B34CCDBB93731F35A30FBAF6EF61196" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp86D7D2BB1F13EA060E8A4774C258349D" Guid="*">
+                            <File Id="fil97A29A8EB5FA6F76E358C08C2A147A36" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpBAC1299B16CA8EF80BEAB5FF71CBABAE" Guid="*">
                             <File Id="fil757DCAE68E4B9D2FB036814046E80B42" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Azure.Commands.Management.Storage.dll" />
                         </Component>
@@ -2580,15 +2580,15 @@
                         <Component Id="cmpF7A753E4CAACA8F93A7BC91300781563" Guid="*">
                             <File Id="filBA239D3586C32D78054EE2EED159ECB3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.StreamAnalytics\AzureRM.StreamAnalytics.psd1" />
                         </Component>
-                        <Component Id="cmpFFDD8F6410D6974FFB14522330AF735A" Guid="*">
-                            <File Id="fil64D6466321D34A60B8CF11ECED481470" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.StreamAnalytics\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp223561C7CC398B710983BE7DCFDD0621" Guid="*">
                             <File Id="fil2D77DA88393EF1F68925D8865B2A931C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.StreamAnalytics\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp6C9E8BA5E4A256E3565E960C30CA3B76" Guid="*">
                             <File Id="filA73FD3481CFBA006ECE325DD2C3581CE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.StreamAnalytics\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp48D3F1B4278B9A0F83A74A5BCCBC518E" Guid="*">
+                            <File Id="fil16809975CC7F5C0D4EA99F63781726F0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.StreamAnalytics\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpB012037C5A1730BCC2B222B4E4992061" Guid="*">
                             <File Id="fil2C2FB742E3413CAB9F998B6B1673B95E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.StreamAnalytics\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -2666,15 +2666,15 @@
                         <Component Id="cmp5168A1A0C7C08B622BF4A720457790F9" Guid="*">
                             <File Id="fil9469135FCCEBC992935929FB977729C9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Tags\AzureRM.Tags.psd1" />
                         </Component>
-                        <Component Id="cmpEEC187A7D543C5AC3DC31AA37589917B" Guid="*">
-                            <File Id="fil686778CCC32FAA6722AB86741D8144D6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Tags\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpFB7D307E2ABB67721699BB2C4E1F7929" Guid="*">
                             <File Id="filCDA42DFBE443BEE042162ED8E285A8AB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Tags\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp998D637BBC9D088BD222D2124DF81103" Guid="*">
                             <File Id="fil72CD9DF8B040CE40AEE9EA2EE6909082" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Tags\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp3DE14901395D0069472BC58F5CAEDB9C" Guid="*">
+                            <File Id="fil4FDBA6106AE93699BA216819B01953E9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Tags\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpE3C9C1D8471F7F52CD4CC8F7B1906EDD" Guid="*">
                             <File Id="fil22EF531A75EC76A53397EC655C5ECB03" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Tags\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -2740,15 +2740,15 @@
                         <Component Id="cmp641EC0122CB44D4F55DA2B5F3FD4F52F" Guid="*">
                             <File Id="filE7FF9BABF537F953B6058C0EE41D7FB3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.TrafficManager\AzureRM.TrafficManager.psd1" />
                         </Component>
-                        <Component Id="cmp380CA9DC02ECFED8543821FDE99908A2" Guid="*">
-                            <File Id="filA2034F3C2EE19A2A93F0DDA16132D478" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.TrafficManager\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpD187CB7739FF6519F37560880EF37715" Guid="*">
                             <File Id="filA8B3E7A4F8FB599805B62F4F7FA15899" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.TrafficManager\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp177B59B29632862B4A45CBD4F9540106" Guid="*">
                             <File Id="fil17B8838788D49BB1D6F03C654DFFE60B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.TrafficManager\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmpA9B080C013529F757E1FA62323B53439" Guid="*">
+                            <File Id="fil7C585C950D1EA8E1ED0C1F5E7D787C51" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.TrafficManager\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpF1B630C29BBECB7A9DC1CF6AA8DF9693" Guid="*">
                             <File Id="fil0DD60C72366AA4AE9FE3EFD5AC46686C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.TrafficManager\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -2805,15 +2805,15 @@
                         <Component Id="cmp9C5D0681FD5D35967C2ADB2CC83EFE07" Guid="*">
                             <File Id="fil89772EC43EA302DF92E4F84172C1244B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.UsageAggregates\AzureRM.UsageAggregates.psd1" />
                         </Component>
-                        <Component Id="cmpC90F3215046EFC52140AC213AC008582" Guid="*">
-                            <File Id="fil2761EAC9854EDB347FD71DA4AC34049A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.UsageAggregates\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp6279AD933DA3E295B2543496D844DAAB" Guid="*">
                             <File Id="filF42CE350E43A0B2D0244C7799F72A972" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.UsageAggregates\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp6CD2ABFA6CEC41AEA1795367E4CB5554" Guid="*">
                             <File Id="fil189D61BF4C432B058BCE888072D62525" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.UsageAggregates\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp044A6ECA5EC60B9EEE66A680EBCDD88A" Guid="*">
+                            <File Id="filF26A9F17F767C396CC09A6B6AEB047AE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.UsageAggregates\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpD7F32F8CD627E4B41877A3E7B5E4B9FE" Guid="*">
                             <File Id="fil66AA0EA3FC5DE7B678BD6AA65B35C6E4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.UsageAggregates\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
                         </Component>
@@ -2876,15 +2876,15 @@
                         <Component Id="cmpF679AA745A78D9232AFA533AC5A06B55" Guid="*">
                             <File Id="fil2BCD1C222604E8D245E834F1092DE5F3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\AzureRM.Websites.psd1" />
                         </Component>
-                        <Component Id="cmp4B56F702DBA6CE99D36A4F491C6343A7" Guid="*">
-                            <File Id="fil2B5BE967668B943402E3C4CFC2479496" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpD0FB9F1837C72A913A5A221811D836CC" Guid="*">
                             <File Id="fil3B2BC62F59229D89CDE5D2AE6360BC51" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpC5759F38821AA48E1C9BD8673AED9C0E" Guid="*">
                             <File Id="fil4B71765782224C550544FEFC24F479AD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp21C48A5691E4C19D3BD120FAC0864F53" Guid="*">
+                            <File Id="filA18731305392B216C65E543C1347D935" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpACE8179B7C1A697082BBA394F5F07BE3" Guid="*">
                             <File Id="filD1DD9680B5BF82D5894A4392D868C893" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll" />
                         </Component>
@@ -2984,9 +2984,6 @@
                         <File Id="fil5E21D53B44D4AF82925C213318480319" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Azure.psd1" />
                     </Component>
                     <Directory Id="dir023BB58B2A71DC3FC9AFE98E2CD36D3A" Name="Automation">
-                        <Component Id="cmpF57ABD3D263C69094E267B2EC8227442" Guid="*">
-                            <File Id="fil72F3DD34F0F4BF9BDC3AB158257CF5D5" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Automation\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp215D8C03C711DF4FF42B3D06ED14C790" Guid="*">
                             <File Id="fil2BD54DE720D9C71E65F90D9020ECEDD2" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Automation\Hyak.Common.dll" />
                         </Component>
@@ -2999,6 +2996,9 @@
                         <Component Id="cmp855703EFA2A131AD51B3A278DB9B705C" Guid="*">
                             <File Id="fil5D4A33057918AD90FBA0027C7366323B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Automation\Microsoft.Azure.Commands.Automation.dll-help.xml" />
                         </Component>
+                        <Component Id="cmpEAC7507F9A0D312D6145F8EF7AC7ACED" Guid="*">
+                            <File Id="fil50A84E3AECEA9FE2A2DCDB93163633D1" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Automation\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp614E0ECB4B4D1ACFBAA7502B66CB53AB" Guid="*">
                             <File Id="filE2B318C5CB0FDBA05F158B7AEDAB6A5B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Automation\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -3061,15 +3061,15 @@
                         <Component Id="cmp4E5F2CFF9BC468A2A8873B7D3261F7AE" Guid="*">
                             <File Id="fil56B4216361B8FAE2391F878C1BBEE9A4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Azure.Storage\AzureStorageStartup.ps1" />
                         </Component>
-                        <Component Id="cmpF3B95149BC862156D03C1B89BAF0D6C6" Guid="*">
-                            <File Id="fil69F752C7F94818F19265798AEAE3494F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Azure.Storage\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp1D11794D4DE13CD2849C407A7736B398" Guid="*">
                             <File Id="fil96E9CABBEC4A47800C1290A56CCB4839" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Azure.Storage\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpCCBFA5B04DFD985227AF6B654A18F375" Guid="*">
                             <File Id="filF9A5CD399000B63880D96C903BA2F099" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Azure.Storage\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmpA7D8AE5E705C7B432EA7A9988BF0B696" Guid="*">
+                            <File Id="fil9F1522A8D2DDA458910B7CA48428369E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Azure.Storage\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp51CCFF2E9C905ED4449EBAD3F5F9CA52" Guid="*">
                             <File Id="fil0EB4B07F60E4270ECB6A0B4F361EE806" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Azure.Storage\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -3180,15 +3180,15 @@
                         <Component Id="cmp51ECC6BA35E7D95A12F581DD08E66F64" Guid="*">
                             <File Id="fil8E8B0758A3F332CE3B5257ECC1EE7CF3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\AzurePreview.psd1" />
                         </Component>
-                        <Component Id="cmp7FC4A5011730D9EB11AEC16FBF3FCCDB" Guid="*">
-                            <File Id="filECB9C1AF8B6BDB55285E7EAAF1065D74" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpECEA3A8AB38FEEEC397A918E3448B3FF" Guid="*">
                             <File Id="fil8FDE63B83D29265A149D5E441B5AF581" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp94999281E0A3076D403238524AFB167D" Guid="*">
                             <File Id="fil74D174CCD02890B13933B8F311472453" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp9C2DF618CF1CC43B8EF8B5EC5E790D8D" Guid="*">
+                            <File Id="fil7AFE7D7AA92D5D305DB9883DA6A7DC3F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmpBCF3C38FB8142F10977444858EFAF20D" Guid="*">
                             <File Id="fil0B1361097C92E2D0E34AA5248E7CD4C7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -3362,9 +3362,6 @@
                         </Component>
                     </Directory>
                     <Directory Id="dir66096BC576F58AE4DB3A35D3B30E3E96" Name="ExpressRoute">
-                        <Component Id="cmp0DED126D0ECE427959CFBBA6EFDFCADB" Guid="*">
-                            <File Id="filE29BF7A6F54A5F4A6948616B96D51A70" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ExpressRoute\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp83BF2BE446B53D1262934BEDEDCA0A49" Guid="*">
                             <File Id="filC6511CD255876BC58C6A1CF2E94D759B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ExpressRoute\ExpressRoute.psd1" />
                         </Component>
@@ -3374,6 +3371,9 @@
                         <Component Id="cmpAA56F765637EDE501F0EC44A1F0396BB" Guid="*">
                             <File Id="filAAD08F74E50457CA9A38E1B2A3E8CAB0" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ExpressRoute\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp98E4FDDFCBE61F31CA14B70063E5EDEB" Guid="*">
+                            <File Id="fil2A2CF9836323339494827E1CDF2051E1" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ExpressRoute\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp545437FAEFB14D6F2392ABDAAD90F3C7" Guid="*">
                             <File Id="fil5E6D60B396C852A77892E64E72D65A91" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ExpressRoute\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -3442,15 +3442,15 @@
                         <Component Id="cmpE649532D45F37D54928D095F9FA83399" Guid="*">
                             <File Id="fil8FB3B64E67BEECBD33C8362E7253C687" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\BouncyCastle.Crypto.dll" />
                         </Component>
-                        <Component Id="cmpD5E8E7767198779920AC9D93B8E05087" Guid="*">
-                            <File Id="filC5CFB99FE1EB459046869F0033FB8FC0" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp96153B9C1921EF93C9484B51120C392D" Guid="*">
                             <File Id="filEA0D0D08D5D99E96498236DC6A2E7DC1" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpA3D8659E0B2EB9572352196896EB4DC6" Guid="*">
                             <File Id="filEB3518119BA0B01C7F5809665DFA945C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmpE288423A55FE6E9FE079B94C37C1D745" Guid="*">
+                            <File Id="filC45D1B74960E73472F6545839FA99573" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp42B92586860E12CFF7E8A202F62CA257" Guid="*">
                             <File Id="filA06DCF8E53EC3673785CE6B476F55886" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -3552,15 +3552,15 @@
                         <Component Id="cmp8012F0215BB802A4015A5806B7E769F6" Guid="*">
                             <File Id="filF22E1BDC7BD6F4D321FBBB46F7247B33" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Azure.psd1" />
                         </Component>
-                        <Component Id="cmp85D44AA2C7A7BF68B1A6F1A7ABC1A06B" Guid="*">
-                            <File Id="fil831E6C4BF0BF20B6BE7632FEDE5C5191" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpA5306E7DCB05BF7D6514ECA36217A97F" Guid="*">
                             <File Id="fil17D3BF1DCD310C128ECE1D2036C80953" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp8BB06418615FA6C96B3B7BD88C3D0872" Guid="*">
                             <File Id="filCE8941AEFA364F2469EFB0613B053AB3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp7BBCB0DF1745D0ACA74311CC42EBF8A2" Guid="*">
+                            <File Id="filAE9F3CC5E4AE5CBBE7CF56581DEE90FC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp271EE413AA0CFA81047392C231D35019" Guid="*">
                             <File Id="fil5A47EE549B105198DC77902E7C3B4FD7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\ManagedCache\Microsoft.Azure.Commands.ManagedCache.dll" />
                         </Component>
@@ -3713,15 +3713,15 @@
                         <Component Id="cmpE341C9178CD349DCB605EB78561663C9" Guid="*">
                             <File Id="fil1D6B292A5C5BC3CFC39CC35067D40538" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\Azure.psd1" />
                         </Component>
-                        <Component Id="cmpBABC07A869239A23E8DD502A034DDAD5" Guid="*">
-                            <File Id="filD6EAF3E90EEAA82A94AA831099F909A6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpB3830B2F5405EB63585D70D9B4A8083B" Guid="*">
                             <File Id="fil45A0077D57701CD57782BB02F4938696" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp609ECF22CBCD5D733FA476301D478408" Guid="*">
                             <File Id="fil9E9F2BDA41F84D51412C86252F71AA33" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmpCBB12BA1748F6EECD91AC628B7E34992" Guid="*">
+                            <File Id="fil6BA9A05BF24A640D59853F3B33802089" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp6EF74500F8C5864E4C97AF617F709A3D" Guid="*">
                             <File Id="fil4BA5E01F1359FEB3586F421EC1FA0A56" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Networking\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -4087,15 +4087,15 @@
                         </Directory>
                     </Directory>
                     <Directory Id="dirE73571EA2365088BBD4338AB4D19D5AC" Name="RecoveryServices">
-                        <Component Id="cmp5E03B4823617D47A7CD22E2DA0822E25" Guid="*">
-                            <File Id="fil779DCE57B120EBCC123D95A2E263D77D" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp5FB7157FEA8EDC9D2D10814DA15518AE" Guid="*">
                             <File Id="fil6090F8BFDA45B5F6E49230667C886927" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpC0EA9433103A723191792448380E84AB" Guid="*">
                             <File Id="filC19D2936401BB415655E1554F85EE97B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmpB379F478799A33A4B4343BA15AC89F48" Guid="*">
+                            <File Id="fil0239F2F240D028259DDB85300C39829C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" Guid="*">
                             <File Id="fil7BC44111780DA333D7D3C421E0660012" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll-help.xml" />
                         </Component>
@@ -4169,15 +4169,15 @@
                         </Directory>
                     </Directory>
                     <Directory Id="dirDF012C486C7A9897E2E985413D188EFB" Name="RemoteApp">
-                        <Component Id="cmpA607917E0A707E1D4D68FF193DC8AD13" Guid="*">
-                            <File Id="filBF94236FA01AE4F95452D9E58A94AAB8" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp876FCC4B6F7590AC9D51ABDD32229647" Guid="*">
                             <File Id="fil3C4F434DCE5410C69A1E3487C1326C5A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp9BFABAFD4BCCB0E223A5423F9E48A908" Guid="*">
                             <File Id="filE981789E3D355209532B0CE4EA414B69" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmpE9D81FD7D6925835AD074DAA91B1B02F" Guid="*">
+                            <File Id="fil589932AD513BC90A52EF486B5B8A2060" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp545D8CBEAE57C9BE9C9B852D32CB58B3" Guid="*">
                             <File Id="fil27EBA2AC9E474ACC5A87F07B809B6DA4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -4276,15 +4276,15 @@
                         <Component Id="cmpC4F524A9EBF63DAC78B9678CF113D652" Guid="*">
                             <File Id="fil9FEAB9D127D01AF382317A68BDBAE174" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Azure.psd1" />
                         </Component>
-                        <Component Id="cmp89FDDB909B522C82BBBFAFD54B105DA2" Guid="*">
-                            <File Id="fil43138139CC922824BFB16321BC1C7D3F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp401224722DA5F5678A1230A4DEC4B453" Guid="*">
                             <File Id="fil19037943914200CC05DA9F7F6B6190CE" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp2970C04AAF17425A9A2994CDC024E65D" Guid="*">
                             <File Id="filDE211E2C0FE4CD385C4EDC0627969481" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp72361F975A27A638FD3BC8AD8D3C24C5" Guid="*">
+                            <File Id="filB2B571B1EFB93DFA000FA24C59CB1AC8" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp23C361C4E13CFE366910008069F72682" Guid="*">
                             <File Id="fil9BDFB8474099CD0A3269404DA202F766" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -4662,15 +4662,15 @@
                         <Component Id="cmp572CBAA060A870457B636480C182F6E3" Guid="*">
                             <File Id="filA870DB1BA05E5465BDE158B5DC54FD4F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\AzureStorageStartup.ps1" />
                         </Component>
-                        <Component Id="cmpBC9A9F6548ABF9C136BBB1E04EA8012C" Guid="*">
-                            <File Id="filBC7610851353722DD9B994CF35AEE466" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmpD8BD7D4C976FE7FE527348B4E7F85B8D" Guid="*">
                             <File Id="filA1C13EA190ADD849F77BDADF0A1A0638" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmpD5A2C7B5CF9A37015F3B71F2DC61EC0B" Guid="*">
                             <File Id="fil2543ECC2E88B1A422905B957B534CA1D" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp33B1D8F375238B9F828BCE9F9EF759BD" Guid="*">
+                            <File Id="fil71A19EFEB941C8C6649B230C51FEDB4C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp09F316A7E95457F48227B20D09F687C7" Guid="*">
                             <File Id="fil28C291CD5B424B1A4BE17AA38F99DF12" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -4838,15 +4838,15 @@
                         </Component>
                     </Directory>
                     <Directory Id="dirA4646967E1E1AC7CFABA2F0120408449" Name="StorSimple">
-                        <Component Id="cmp9CB9480A6712E96612C0E6B19C8D015C" Guid="*">
-                            <File Id="fil80CFE8311CF79D4014DB7449A88EFCE6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp133EB89F214BEF04B57E383DC1B17E5D" Guid="*">
                             <File Id="fil78B52273C287C6904B2521004C3A5EF3" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp1D46EDC68E31CEEC9FD00781E3A5EA61" Guid="*">
                             <File Id="filDAD7320AD5013C57E73D0242930E766F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmpFDB6C90906A96F41FA727D16A7CF6A27" Guid="*">
+                            <File Id="fil34305CD95758B21BF477C4B3A692E33B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp6A927AFF9D7CBE438F31603C59A5D1A6" Guid="*">
                             <File Id="filB7A4B25F40CE730D374967CEFF6C356B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -4918,15 +4918,15 @@
                         </Component>
                     </Directory>
                     <Directory Id="dirE7E1C4D3416099C7648453EA7E433216" Name="TrafficManager">
-                        <Component Id="cmpDDE3512878BC62F29153D78C18FB2E3B" Guid="*">
-                            <File Id="fil1DD3B403CBA1F501FFE57FCA127C4479" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\Commands.Common.Authentication.dll" />
-                        </Component>
                         <Component Id="cmp7A04B677540DBCD0BD49BD5C26172FF4" Guid="*">
                             <File Id="fil81A720071C04D978EF72A194C442D6CF" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\Hyak.Common.dll" />
                         </Component>
                         <Component Id="cmp2ED0ECADA753ED85E1B455FC4609530F" Guid="*">
                             <File Id="filD0A56800A638FCB0CA085504FBD42EFC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\Microsoft.ApplicationInsights.dll" />
                         </Component>
+                        <Component Id="cmp8BDD1ECFB41E61E61E220BFCCFB6DE10" Guid="*">
+                            <File Id="fil5D94DCBE8E6EFAEBE8A22A38D1AFD27E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
                         <Component Id="cmp0DBA9B291A7405C6A2536BF95D2BB5F2" Guid="*">
                             <File Id="fil810FF52C980AFBCC54E32096ADD5CC42" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\TrafficManager\Microsoft.Azure.Common.dll" />
                         </Component>
@@ -5008,9 +5008,9 @@
         <ComponentGroup Id="azurecmdfiles">
             <ComponentRef Id="cmp0761C025FCF8EF027A5BC23C72777C52" />
             <ComponentRef Id="cmpCC0D4240D3640D2D425852E0F2A4D31E" />
-            <ComponentRef Id="cmpE4F8CD6FE516185BE62F13CFAFE3AB51" />
             <ComponentRef Id="cmp658F4F28B5894F240AF3AE214E228C7A" />
             <ComponentRef Id="cmpBE01F246267602912E7BB7FAC7C89B62" />
+            <ComponentRef Id="cmp78A25B9098BAB46687796EF93BE6DBD2" />
             <ComponentRef Id="cmp8442839E6CCDD8A283EF37DF080C3AE1" />
             <ComponentRef Id="cmp39B0D2598A6CE580733F0226C08A3242" />
             <ComponentRef Id="cmpA478F262D7EEA3E8F5BE546683E3EB19" />
@@ -5046,13 +5046,13 @@
             <ComponentRef Id="cmpBEA6E3263480C18705DC2E3B15E3C1CF" />
             <ComponentRef Id="cmp957D146263F021CE3EF1CBADBF06D2C4" />
             <ComponentRef Id="cmp5FB922E1DB9224DAB3732AEA3ECC0388" />
-            <ComponentRef Id="cmp98E6818F4D0081B33A02BF17EA784266" />
             <ComponentRef Id="cmp2E3A58C9336220FF001B6912E569A1C3" />
             <ComponentRef Id="cmp1C7906F849294A53D53A70383F55445E" />
             <ComponentRef Id="cmp0BCF22C3D0BA8A6CA8E81B13EC58698F" />
             <ComponentRef Id="cmp553920503BB78B65363F76318EDBED2A" />
             <ComponentRef Id="cmp80D5A1CD22527D1EF8CD7AF5369D67F3" />
             <ComponentRef Id="cmp4FF21ED4EA95D39B116D37EBAA6A7A91" />
+            <ComponentRef Id="cmpE03B0B26C7631EC198C4AE91E98F5F70" />
             <ComponentRef Id="cmp481E0B9DF760B9DDFCCCA4BF40106827" />
             <ComponentRef Id="cmpF485AEC2B923FAB8C643F3B29009BF26" />
             <ComponentRef Id="cmpECF981B9839654E15E12F970548E5E3A" />
@@ -5080,9 +5080,9 @@
             <ComponentRef Id="cmpA341B5B54A0B03448E139EDB9A586B96" />
             <ComponentRef Id="cmpCACCECAB9F530A76B2AD3660C5BF8E74" />
             <ComponentRef Id="cmpE48A93B0493B28E942E948BA2D821B91" />
-            <ComponentRef Id="cmpF61DDA24C5B3FA835259E6ED1E6F310A" />
             <ComponentRef Id="cmp41036154EE783BC3DEFB1A4C67DC0771" />
             <ComponentRef Id="cmp698928A59E1578478BA71B24902667A3" />
+            <ComponentRef Id="cmp6516C3983997DABDCD7844B6B6F10F2F" />
             <ComponentRef Id="cmp46AB67763AA4CB2288EC5BCF65A0B426" />
             <ComponentRef Id="cmp9D4C6B071BF015D0AFF2F9549EF243C2" />
             <ComponentRef Id="cmp102CF9185F48CEE11E320B27828EB092" />
@@ -5102,9 +5102,9 @@
             <ComponentRef Id="cmpB3AF7287C2319FB3890DCA0EC93AE342" />
             <ComponentRef Id="cmpDB96969C9372FD180F11522277C12D95" />
             <ComponentRef Id="cmp503CF348442C9E12C3AF1C6110A5AE6F" />
-            <ComponentRef Id="cmpF05AC81E437624D7938CC45B54E13E27" />
             <ComponentRef Id="cmpC412B85F27935BA89ABA93BEB7BBB52D" />
             <ComponentRef Id="cmp8797CC865D183718D54EB25354B5E2E4" />
+            <ComponentRef Id="cmp341162180BF390CE2A96709D6793E79A" />
             <ComponentRef Id="cmpD0EF8A0F8719C6D155CF9683A6832BD9" />
             <ComponentRef Id="cmpFDFB38E21048DD505BCAD31F5136992E" />
             <ComponentRef Id="cmpC2439F65706917CA4AABD3AF6AFB856A" />
@@ -5123,9 +5123,9 @@
             <ComponentRef Id="cmp20BC1C9C8D5EE2CB519FA5A297E5931C" />
             <ComponentRef Id="cmp7460DEC2372E949D937FC3760B7CF7F1" />
             <ComponentRef Id="cmp613FC7082DD4AE634B8DADCFF3516FB5" />
-            <ComponentRef Id="cmpB53781A73EF6C30C97086FD241F47728" />
             <ComponentRef Id="cmp7665E867DBFD0D6117D6F85080B67751" />
             <ComponentRef Id="cmp510B79C102392B6AE4DD103F810E787B" />
+            <ComponentRef Id="cmp9ED8706300C8CFD17C8CB62730F15BDA" />
             <ComponentRef Id="cmpF59DACE5A099A1224C2EBE519139EA1B" />
             <ComponentRef Id="cmp5C982BDD1D0615791970EB8BF2D2E9AF" />
             <ComponentRef Id="cmp641D1C76590267170546F7C8FE37B488" />
@@ -5148,12 +5148,12 @@
             <ComponentRef Id="cmpC1B4A054FDF189529C7F141DFF34F627" />
             <ComponentRef Id="cmpF1D2745AF8971AC4B7E570D509984890" />
             <ComponentRef Id="cmp235245AE05B9E5ED010EE787C63217C5" />
-            <ComponentRef Id="cmpB63C082415364C220A3484FE813E5C2B" />
             <ComponentRef Id="cmpE0B0C8ED8BBFFD0F88A2D61AB9984AB2" />
             <ComponentRef Id="cmpEFF681572AC1D462B15B14C64B555792" />
             <ComponentRef Id="cmp2A379397CB30B376A85BCA91AC27B299" />
             <ComponentRef Id="cmpC41F465A6E63EB7F3E8E1184B4434F51" />
             <ComponentRef Id="cmp88D8EC51D9872B77C8335E8063852E25" />
+            <ComponentRef Id="cmp8D65B0DCF18B0EA7A63591EBC70C510A" />
             <ComponentRef Id="cmp12F7010B33D1FFDE1CA3DEF2102C85D3" />
             <ComponentRef Id="cmpCF61952C710D15D413419F5C6EF0A298" />
             <ComponentRef Id="cmpC4CA139071A1085B24F7A9A5322B2469" />
@@ -5175,13 +5175,13 @@
             <ComponentRef Id="cmp59CB87DAB7E8479242138B34A3971566" />
             <ComponentRef Id="cmp887ACC42D403DDA6F3554CE7D43E0B23" />
             <ComponentRef Id="cmp8D6E468747E93CD69A8E2A0D608759F8" />
-            <ComponentRef Id="cmp5F72E6720B7BBE3CBED99E9161EF739A" />
             <ComponentRef Id="cmp6F14BB2DCB8DCC909D5FEA84EB6E7301" />
             <ComponentRef Id="cmp82B66E00C3F3370F9A364A749F497883" />
             <ComponentRef Id="cmpFF226ED5701894F77AC9E8912B83AB67" />
             <ComponentRef Id="cmp5C8DB854624DF2950D61BA179C5FD373" />
             <ComponentRef Id="cmpF722AB88CF534C159376B90D3352E735" />
             <ComponentRef Id="cmpA2DFBBC7C1D2551CE1820D4BFE68DD25" />
+            <ComponentRef Id="cmp4A6F96C22730818C662DA09055154FE0" />
             <ComponentRef Id="cmp863C865281BE4875E207BF573BB434C8" />
             <ComponentRef Id="cmpB0584BB55D8714E4CF5E60167B55282E" />
             <ComponentRef Id="cmpC964B4550D9D1C104A224E22B19599BF" />
@@ -5215,9 +5215,9 @@
             <ComponentRef Id="cmp0BDDC10BCAFF9EC25710B20367203609" />
             <ComponentRef Id="cmpC7297788AE102ED861765ADE84F7A59B" />
             <ComponentRef Id="cmpE2DA894B67E7F107B24A69AD6B87F8B3" />
-            <ComponentRef Id="cmpCEDC2B2DC31F9DE886EDC886A6DC8BDB" />
             <ComponentRef Id="cmpCC409403AF670A9E0538AC743C61BD66" />
             <ComponentRef Id="cmp8F649774D57C8E90EC765D8FCE36E32A" />
+            <ComponentRef Id="cmp97D0BCD046DCE5E1A3DA3611DDBA27AB" />
             <ComponentRef Id="cmpFBB75A5451448B356C97E62D2C6C10A0" />
             <ComponentRef Id="cmp1CB1E6D6A2D939FB32D9ACD70681644D" />
             <ComponentRef Id="cmpAA00FCFEE63D9A20C2618B36B1848D7C" />
@@ -5273,9 +5273,9 @@
             <ComponentRef Id="cmp22C16EA85B773C14B7E6439621F10355" />
             <ComponentRef Id="cmp8BCA174B740D6FE9FE610DDF340C002E" />
             <ComponentRef Id="cmp75C3D72B9C46E1B9D3F51CE3D29F6F00" />
-            <ComponentRef Id="cmp786E1B0FECBA216B39D8366C901B0412" />
             <ComponentRef Id="cmpEEBCE6D5D00306CCD759CE5B7793B164" />
             <ComponentRef Id="cmpEA6F740D378DB99E31F7433B8C57865A" />
+            <ComponentRef Id="cmpD3E3F0EC28639F2167A80B2CFFA48D3A" />
             <ComponentRef Id="cmp7426DB42CCB21FE78D19972725B67108" />
             <ComponentRef Id="cmp2C9E745784F2C9083CBC32D2F20EFDDF" />
             <ComponentRef Id="cmpE426ACE7C4AFBAF81F9839C920B01D37" />
@@ -5304,9 +5304,9 @@
             <ComponentRef Id="cmp9E138A369DBE819C972D9BBF4BEC7A7D" />
             <ComponentRef Id="cmpFFD632DFF203CC929CB0CACD3AAE8AE3" />
             <ComponentRef Id="cmp9AA4CD4105408D3F4F12949A1C0940D1" />
-            <ComponentRef Id="cmp7D0C86492816C6DBCBCE8A7CEF4458C7" />
             <ComponentRef Id="cmp70A49156E2EDA72CDD86623D5D7012CA" />
             <ComponentRef Id="cmp2FEEAA23FF0F261C6E47AB598DBBF8A6" />
+            <ComponentRef Id="cmp2724FFAE2E4148D8281FED1A2B986135" />
             <ComponentRef Id="cmp5835D87A5A94F44EAAAE61BCA33C1D80" />
             <ComponentRef Id="cmp96C621A371FF4A410548AAB167869D94" />
             <ComponentRef Id="cmpBFBF6E4B62912618B79304EFC6838BAB" />
@@ -5330,9 +5330,9 @@
             <ComponentRef Id="cmp00A233D640AFCDAFCFD4BB5B674360E4" />
             <ComponentRef Id="cmp3D012023B86D27262DE3502AE149FFA6" />
             <ComponentRef Id="cmp1626D75E4A091FD36D772FB1DEAEF2E9" />
-            <ComponentRef Id="cmpA03D8395C7802788B3FC5C5F08929C98" />
             <ComponentRef Id="cmpDB37FD2F23B17651F12F7CBA5E841363" />
             <ComponentRef Id="cmpFA06C9BD3FF76E0DAA7ACE5C9435F394" />
+            <ComponentRef Id="cmp198EEB211792E85743513C6C91F89DE2" />
             <ComponentRef Id="cmp5014A98086549EE22F2F2DF9C7C1B1F2" />
             <ComponentRef Id="cmp23342B840C2625BED919B4FA66BA0BA6" />
             <ComponentRef Id="cmp001FEDC74DD7D918EFE88F2EB8E4285C" />
@@ -5358,9 +5358,9 @@
             <ComponentRef Id="cmp55C12CFB770FC05F3DEAE953E5D66663" />
             <ComponentRef Id="cmp0DA8E094A737664DAD35F560902CC483" />
             <ComponentRef Id="cmp9AADE49B40AE34E78613184F68A0C602" />
-            <ComponentRef Id="cmpAE1758E89597D9566362D317E9DADF3A" />
             <ComponentRef Id="cmp6739EA963462CB23B33E80066E3DDCF1" />
             <ComponentRef Id="cmp7EAAC8C6FB9DA70F1A7DFE4D980EA958" />
+            <ComponentRef Id="cmp4CF3FA0E57E11971867996EC168DCF85" />
             <ComponentRef Id="cmp4A6F5276FA9D06F16F5CD389241BFB30" />
             <ComponentRef Id="cmp43704B697D5193F7856E6263E1CBC13F" />
             <ComponentRef Id="cmpEAF94024F554AAB426C83C5DC168543F" />
@@ -5386,9 +5386,9 @@
             <ComponentRef Id="cmp5CA8859F1C394CC8A63A4EB72FC74FC5" />
             <ComponentRef Id="cmp1C6E67BF7E6A2932D8205DEE8EEBD5BD" />
             <ComponentRef Id="cmp9D190B38C7D3A893B21DFAB4A757C98B" />
-            <ComponentRef Id="cmp4BE2C813032AB544957FEA0A49C2ED8A" />
             <ComponentRef Id="cmp04AE56BE6D07E336F237E3D542B1F69D" />
             <ComponentRef Id="cmp6808C337F61F07015FF34B00DDA3D4E7" />
+            <ComponentRef Id="cmp4D76DB745CF6F307B2EFAAA66F450FFD" />
             <ComponentRef Id="cmp46A49A4018A91E57DC174499B96727A1" />
             <ComponentRef Id="cmpB4543BA4CE0FD0319695F544DFC2035E" />
             <ComponentRef Id="cmp7FB7B41EC1BF5A8BEF7C3ABB28E68B57" />
@@ -5414,9 +5414,9 @@
             <ComponentRef Id="cmp64D2198150FEFD8799857912AC427831" />
             <ComponentRef Id="cmpBBB7C495123829980FBE79A9D2EB53A3" />
             <ComponentRef Id="cmp46D2B2B0B3583E9D988E8822E4019690" />
-            <ComponentRef Id="cmpA68CC036FAA9FC24A6BD990C44FC5520" />
             <ComponentRef Id="cmpBAC33A5E24A63A1AA3FA603EC25BA196" />
             <ComponentRef Id="cmp183CE3EAEAA01DB989815CD9E22E1975" />
+            <ComponentRef Id="cmp83C0F1BC40C81FA65D037B344F79178F" />
             <ComponentRef Id="cmp20A05509BD755C1EF519D072611A0E0F" />
             <ComponentRef Id="cmpDE49418D6A95612CBD93742D9123E2CF" />
             <ComponentRef Id="cmp3096FA61D43597AB3DBA27FAB68B4EC2" />
@@ -5442,10 +5442,10 @@
             <ComponentRef Id="cmpAB04FC1EEE889CA90013762F64086BFF" />
             <ComponentRef Id="cmp4714276292444ADF7D34F509F31C8102" />
             <ComponentRef Id="cmp007494D6DDD084F46271414EDBAE4A28" />
-            <ComponentRef Id="cmpEC94F13AD694C2832852C2930006B2BF" />
             <ComponentRef Id="cmpF892ECD9E56A470DCBCDFB5721EFD871" />
             <ComponentRef Id="cmp8B8A7BBF33AC8748C36AF2D0F867CC3B" />
             <ComponentRef Id="cmpBCA648A3B7B30300ACDCC83746172368" />
+            <ComponentRef Id="cmp57CB23DBCAC7D99E3B2A49BF7070C62D" />
             <ComponentRef Id="cmpDBE0EFA9AB2C3936D498914505FD59BD" />
             <ComponentRef Id="cmp3CD3D1820190A9634EFE76B4737874EB" />
             <ComponentRef Id="cmp043B164F4D1039F8B2F62D774A383C9B" />
@@ -5487,9 +5487,9 @@
             <ComponentRef Id="cmp2BC048C87A71EBC0CB5EF453100E00AF" />
             <ComponentRef Id="cmp13747CF5FA04719E8EB6868EAB0E18B7" />
             <ComponentRef Id="cmp0362FE47213976940F462CA25B10B16B" />
-            <ComponentRef Id="cmp21C38E11DDBAC691295B44F1F98B54F2" />
             <ComponentRef Id="cmpE90AEEBC9A23169D337CEEA1678D742C" />
             <ComponentRef Id="cmpD5EA0B883838D180379E0B369B8FE404" />
+            <ComponentRef Id="cmpD44DD9B02C4DB830D51107F822C33873" />
             <ComponentRef Id="cmpC0463AC44CFB7B9988043DDFA5C641DC" />
             <ComponentRef Id="cmp0F3E424ABFDB40A51E7EFE630746401D" />
             <ComponentRef Id="cmpD01F3B2B2187CA0F19590E1A055AFCFC" />
@@ -5530,9 +5530,9 @@
             <ComponentRef Id="cmpA398972142ABD0AC819F613EE832B65C" />
             <ComponentRef Id="cmpFE91A142C4108B5EB50D6C5C5F4A4FA9" />
             <ComponentRef Id="cmp065EDC002BB63B6AA573F18152B7240F" />
-            <ComponentRef Id="cmp62E03EDC12116BA9909F21AE9E146689" />
             <ComponentRef Id="cmp02E49F28BB0FA3174A478847B857A4D0" />
             <ComponentRef Id="cmp53B7AE5C484C188098FEE906B381461C" />
+            <ComponentRef Id="cmp246D81BDC7381CDCA512555564D15DF8" />
             <ComponentRef Id="cmpFCCC1C3A49857F9109FEB6AE04888D08" />
             <ComponentRef Id="cmpDBE01664D9AB025B458069DDEDD88556" />
             <ComponentRef Id="cmp3C7CEECFE9ABC9ED0A54E8E4EDD47B27" />
@@ -5575,9 +5575,9 @@
             <ComponentRef Id="cmp999479ACC191E94DE3C836F45E40CC5D" />
             <ComponentRef Id="cmpFA5D7F947B235DF25AF77E5C80F17A7F" />
             <ComponentRef Id="cmpDAB75931F4DB7BCDDF30F7CEF8F61FB5" />
-            <ComponentRef Id="cmpB347361B53ABCEC9F8025902EF3C6B9D" />
             <ComponentRef Id="cmp8684AA425BD610EEC2F15925581BF893" />
             <ComponentRef Id="cmp056C8B4C8FE7271CEC0AD4AD7AAB3018" />
+            <ComponentRef Id="cmp1DAF444CC3ACB5049A7BFC352270E40A" />
             <ComponentRef Id="cmpB5106B48E2EB7B701A40C3B0D8FA0A2E" />
             <ComponentRef Id="cmp6ECD08486E9BFFFA4F5BE1092972D0AF" />
             <ComponentRef Id="cmpF7968DE0E82CE5824C98B69162856454" />
@@ -5596,9 +5596,9 @@
             <ComponentRef Id="cmp275E5D23204FF3DB5A484691FFA2C6F5" />
             <ComponentRef Id="cmp5E9A44B7330C75772463CB17D6D24AA6" />
             <ComponentRef Id="cmp17459EC3296F82D03FEF8C426C8DA7EA" />
-            <ComponentRef Id="cmp7E2625E50BA6384A7DB23547D884D8EF" />
             <ComponentRef Id="cmp7CE9821E11931CE1140ACA06CF2D38B4" />
             <ComponentRef Id="cmp6D68CAF3787D43356F3C2CB592699D2D" />
+            <ComponentRef Id="cmp20FBC1203D91D529F69E519C9C2F78B8" />
             <ComponentRef Id="cmp200DDA39E5F438CD8F080DA375764D0C" />
             <ComponentRef Id="cmp05BE3ECEE00FF8C8EA0CCCA10B35B66F" />
             <ComponentRef Id="cmpC9691E1D00FBDB44AFB6B17AF835B85C" />
@@ -5622,9 +5622,9 @@
             <ComponentRef Id="cmpCDBCF0967EA30044FF3F4478A30C1D5B" />
             <ComponentRef Id="cmp6F865A1998C9B6DAE0E8844D0EECF40A" />
             <ComponentRef Id="cmp9002DD73D47754F2109499247914700F" />
-            <ComponentRef Id="cmp598FE09226C5E30DF4B7EC0527F5E1EA" />
             <ComponentRef Id="cmpD738842B230F04E64FD98E3E850E6338" />
             <ComponentRef Id="cmp2BE62623A92CD0986F0915CB16373E90" />
+            <ComponentRef Id="cmp95E80D6E42ED3C994C89564D15A4E501" />
             <ComponentRef Id="cmpCBBCCDE16C2F179A9160E366F5449CF4" />
             <ComponentRef Id="cmp800A5A37141E8CAEBF4EA2BADCA200F8" />
             <ComponentRef Id="cmp3A5D44D65C8C4CE297EDA03045A49C82" />
@@ -5645,9 +5645,9 @@
             <ComponentRef Id="cmpAB89DA9A645E197D78DE69AEF963C260" />
             <ComponentRef Id="cmp103ACA9079CDD574094214F46E76D71B" />
             <ComponentRef Id="cmpC96DAF4A31F86D19246E39394F496F83" />
-            <ComponentRef Id="cmp3F34A4D3F22CC8AA99DD553E7DEC3AB5" />
             <ComponentRef Id="cmpA77D5875EABE5151973A245C04E3858E" />
             <ComponentRef Id="cmpEDB84317615898A496C0FF620B372C87" />
+            <ComponentRef Id="cmp91C07F114413AEF46868515C7011816D" />
             <ComponentRef Id="cmp5CAA968EE7C749E4480233FD90EDFE63" />
             <ComponentRef Id="cmp66ECF842EEB4EB595925E310358E9750" />
             <ComponentRef Id="cmpE7C8C6576C1069564C717CBBBD229F39" />
@@ -5667,9 +5667,9 @@
             <ComponentRef Id="cmpC00974919B90C9055BED1F2A9DA95441" />
             <ComponentRef Id="cmpE300D8B185C427E05E95BA97413F6CC8" />
             <ComponentRef Id="cmp301F9E8FA547D7C9A0DF4FF20F87815D" />
-            <ComponentRef Id="cmp92855C969A6098F84BD25264461325FF" />
             <ComponentRef Id="cmp5EF3051C386C8DAA602E772A7C258726" />
             <ComponentRef Id="cmpD143AF1A4E05D7D8425777ECA2F5440D" />
+            <ComponentRef Id="cmp607D3E4AA3A57518DD04E360E5BADB1A" />
             <ComponentRef Id="cmpC546D62FCE2A69288747825E8944417D" />
             <ComponentRef Id="cmp25BEB7D01AAA05FB62FE097BCBEF80D0" />
             <ComponentRef Id="cmp763AEEF23062A4949090DC62E1A8A525" />
@@ -5699,9 +5699,9 @@
             <ComponentRef Id="cmp52C57B0899D353B0A0560BB9EE958B68" />
             <ComponentRef Id="cmp4DDC11D6580AB2CC03CADEDD62194BDA" />
             <ComponentRef Id="cmpE3F8AFED4B05B18FC4A7CAB87B1CB417" />
-            <ComponentRef Id="cmp9DEA7D0FDA207CBAD89728665D1BF0BD" />
             <ComponentRef Id="cmpB3DCE82FE478526DDF1700692DBA9623" />
             <ComponentRef Id="cmpA83327F7CCE4FB576DFC29FAB7F39D59" />
+            <ComponentRef Id="cmp9922F56B13A3FABD0F19E738D0175735" />
             <ComponentRef Id="cmp0C4C37E15F9F4671DEFA34F55D2FC9A8" />
             <ComponentRef Id="cmpC0FCF27F6E0F755E5C6EF5581586B5B3" />
             <ComponentRef Id="cmpA783DF1847331FABB8D47E1EF5B9248F" />
@@ -5732,9 +5732,9 @@
             <ComponentRef Id="cmpA534986DA2E43D7E50E9A6E219478266" />
             <ComponentRef Id="cmp6D34FB8F9A9678D4511D4BB8E0800104" />
             <ComponentRef Id="cmpE1FBC775E0C4E8ECA1EB6C0F338FEDFA" />
-            <ComponentRef Id="cmp6AA687D723EA1914F546093B564BF268" />
             <ComponentRef Id="cmp02DCD4998B3C2CF365F95C5A38848DB3" />
             <ComponentRef Id="cmpCF891519A685521085AC294E4B891DD2" />
+            <ComponentRef Id="cmp12478F787751D3B92FA94F4344630D35" />
             <ComponentRef Id="cmp0FD8A30BE2A6216F0F741F6A28419061" />
             <ComponentRef Id="cmp37090521052972B67F25727C8F5F8232" />
             <ComponentRef Id="cmpD611BB6D8ECAF2AB15AD7A39A047C063" />
@@ -5757,9 +5757,9 @@
             <ComponentRef Id="cmpDD0209B9F15287C06AF2A301A6DA9C67" />
             <ComponentRef Id="cmpB904935B70928974D5ABC88308A90047" />
             <ComponentRef Id="cmp5C61554BD83089367CC25D6B8087BA72" />
-            <ComponentRef Id="cmpD6846566F91A9E01DBDE45562A50897E" />
             <ComponentRef Id="cmp3C9C507DDA08AF33411AE879EDD0A4F2" />
             <ComponentRef Id="cmp1F33CAEBDF996E2FAB3DB353F78D07B4" />
+            <ComponentRef Id="cmp40B79E2AA2DCD4CDE491C95D1DC7C56E" />
             <ComponentRef Id="cmp7A202BA2C4E53ABAB23813D24FC94A74" />
             <ComponentRef Id="cmpD2857DB3B9753B4137A2A9ECBF8E9B0B" />
             <ComponentRef Id="cmp96672414191DFAC6E5AA290880707F57" />
@@ -5804,9 +5804,9 @@
             <ComponentRef Id="cmp60521804CF648610DFEE8873C98DF6FE" />
             <ComponentRef Id="cmp4AFA8C6EDE02E2B9FC026EFD116FAFA7" />
             <ComponentRef Id="cmp926FBB377170F25C198A076240F70BB6" />
-            <ComponentRef Id="cmp4150E9A91672E4011EF7F410323B0405" />
             <ComponentRef Id="cmp59441725CC89648B8BF9D5D4B503100A" />
             <ComponentRef Id="cmpBCE3E3885799B8A3163ACE2AE0F576E9" />
+            <ComponentRef Id="cmp86D7D2BB1F13EA060E8A4774C258349D" />
             <ComponentRef Id="cmpBAC1299B16CA8EF80BEAB5FF71CBABAE" />
             <ComponentRef Id="cmp424E120D40F4D297C20CCA3E2790FAF7" />
             <ComponentRef Id="cmp0861FE5479F2A5D5C40F2BB01ECB8CC9" />
@@ -5847,9 +5847,9 @@
             <ComponentRef Id="cmpFC0CB80997A65B711715114CE05F5352" />
             <ComponentRef Id="cmp80CA4C05D23968F83D1506A2A6588AE6" />
             <ComponentRef Id="cmpF7A753E4CAACA8F93A7BC91300781563" />
-            <ComponentRef Id="cmpFFDD8F6410D6974FFB14522330AF735A" />
             <ComponentRef Id="cmp223561C7CC398B710983BE7DCFDD0621" />
             <ComponentRef Id="cmp6C9E8BA5E4A256E3565E960C30CA3B76" />
+            <ComponentRef Id="cmp48D3F1B4278B9A0F83A74A5BCCBC518E" />
             <ComponentRef Id="cmpB012037C5A1730BCC2B222B4E4992061" />
             <ComponentRef Id="cmpD42560EBB0A306C85371A2B783410923" />
             <ComponentRef Id="cmp35B82E50E0D41CA67B5BF380494A7956" />
@@ -5875,9 +5875,9 @@
             <ComponentRef Id="cmp3A7AB9C2550B12DEC90621B47176788A" />
             <ComponentRef Id="cmpF69128DBF9C6F7F630E779CA78490603" />
             <ComponentRef Id="cmp5168A1A0C7C08B622BF4A720457790F9" />
-            <ComponentRef Id="cmpEEC187A7D543C5AC3DC31AA37589917B" />
             <ComponentRef Id="cmpFB7D307E2ABB67721699BB2C4E1F7929" />
             <ComponentRef Id="cmp998D637BBC9D088BD222D2124DF81103" />
+            <ComponentRef Id="cmp3DE14901395D0069472BC58F5CAEDB9C" />
             <ComponentRef Id="cmpE3C9C1D8471F7F52CD4CC8F7B1906EDD" />
             <ComponentRef Id="cmp9E3D4D3193657BCC72C5BBACB8F462DF" />
             <ComponentRef Id="cmp51E591D4C822CC2C26F4A890A699AFCC" />
@@ -5899,9 +5899,9 @@
             <ComponentRef Id="cmp4BFEB32A5496B145F0763FF85A757536" />
             <ComponentRef Id="cmp9985A42F73AEC37B96446426793628DB" />
             <ComponentRef Id="cmp641EC0122CB44D4F55DA2B5F3FD4F52F" />
-            <ComponentRef Id="cmp380CA9DC02ECFED8543821FDE99908A2" />
             <ComponentRef Id="cmpD187CB7739FF6519F37560880EF37715" />
             <ComponentRef Id="cmp177B59B29632862B4A45CBD4F9540106" />
+            <ComponentRef Id="cmpA9B080C013529F757E1FA62323B53439" />
             <ComponentRef Id="cmpF1B630C29BBECB7A9DC1CF6AA8DF9693" />
             <ComponentRef Id="cmpEC2F0DD8B62D2A7D4A1F0C22F1A9055A" />
             <ComponentRef Id="cmp6D3FEF5EAA8C04021BA9BEF10A4FC436" />
@@ -5920,9 +5920,9 @@
             <ComponentRef Id="cmpF7BE98BA57F0B078A25F547B8CE00B17" />
             <ComponentRef Id="cmp99CD149FABD9A57A814EF84BA2BA5C85" />
             <ComponentRef Id="cmp9C5D0681FD5D35967C2ADB2CC83EFE07" />
-            <ComponentRef Id="cmpC90F3215046EFC52140AC213AC008582" />
             <ComponentRef Id="cmp6279AD933DA3E295B2543496D844DAAB" />
             <ComponentRef Id="cmp6CD2ABFA6CEC41AEA1795367E4CB5554" />
+            <ComponentRef Id="cmp044A6ECA5EC60B9EEE66A680EBCDD88A" />
             <ComponentRef Id="cmpD7F32F8CD627E4B41877A3E7B5E4B9FE" />
             <ComponentRef Id="cmp0E3AF7F7B05B46085AB172718ACDFCA5" />
             <ComponentRef Id="cmp88D2EA56DD2C2EFA2854C65FCA5FCE26" />
@@ -5943,9 +5943,9 @@
             <ComponentRef Id="cmp31CCE98DB6C5E1DB88E1B384C167D241" />
             <ComponentRef Id="cmp83791849FA3C29D4D8CCF5D3FFA24FC1" />
             <ComponentRef Id="cmpF679AA745A78D9232AFA533AC5A06B55" />
-            <ComponentRef Id="cmp4B56F702DBA6CE99D36A4F491C6343A7" />
             <ComponentRef Id="cmpD0FB9F1837C72A913A5A221811D836CC" />
             <ComponentRef Id="cmpC5759F38821AA48E1C9BD8673AED9C0E" />
+            <ComponentRef Id="cmp21C48A5691E4C19D3BD120FAC0864F53" />
             <ComponentRef Id="cmpACE8179B7C1A697082BBA394F5F07BE3" />
             <ComponentRef Id="cmp22803095492E8D0D37C1DD736AABEA02" />
             <ComponentRef Id="cmp9476B9E28FEBB017468E192B45CA0750" />
@@ -5977,11 +5977,11 @@
             <ComponentRef Id="cmp4E4BAFA8406471B1D2FFA4860A8AEAA7" />
             <ComponentRef Id="cmpC84155BCEC352235456F36314798DEB6" />
             <ComponentRef Id="cmp5DFC4ECCB8BBF842D8069F3036386B84" />
-            <ComponentRef Id="cmpF57ABD3D263C69094E267B2EC8227442" />
             <ComponentRef Id="cmp215D8C03C711DF4FF42B3D06ED14C790" />
             <ComponentRef Id="cmpE75B6D337DC4A69EC4CB3C70C4607514" />
             <ComponentRef Id="cmp2885A72095CC4D23D58804836236D163" />
             <ComponentRef Id="cmp855703EFA2A131AD51B3A278DB9B705C" />
+            <ComponentRef Id="cmpEAC7507F9A0D312D6145F8EF7AC7ACED" />
             <ComponentRef Id="cmp614E0ECB4B4D1ACFBAA7502B66CB53AB" />
             <ComponentRef Id="cmpCFF660734313D3C9592DB86F0D4B4EFE" />
             <ComponentRef Id="cmp86A3FC330AB128431B87D9FC2A1D3109" />
@@ -6002,9 +6002,9 @@
             <ComponentRef Id="cmp5E7A927FFF2CD1AC2D9A4D4746132F63" />
             <ComponentRef Id="cmpA4896332D2E9278A5CFFC76462E3D397" />
             <ComponentRef Id="cmp4E5F2CFF9BC468A2A8873B7D3261F7AE" />
-            <ComponentRef Id="cmpF3B95149BC862156D03C1B89BAF0D6C6" />
             <ComponentRef Id="cmp1D11794D4DE13CD2849C407A7736B398" />
             <ComponentRef Id="cmpCCBFA5B04DFD985227AF6B654A18F375" />
+            <ComponentRef Id="cmpA7D8AE5E705C7B432EA7A9988BF0B696" />
             <ComponentRef Id="cmp51CCFF2E9C905ED4449EBAD3F5F9CA52" />
             <ComponentRef Id="cmp4967A1F479006EA37BC07F96B7FBBFC3" />
             <ComponentRef Id="cmp89CC09DB4DBDB9D4628CAD12DC3F1679" />
@@ -6041,9 +6041,9 @@
             <ComponentRef Id="cmpDFC157C3442E97BDF0570FFD8C7B977D" />
             <ComponentRef Id="cmp4BF22B003CB6023A1EABDD3AE357872E" />
             <ComponentRef Id="cmp51ECC6BA35E7D95A12F581DD08E66F64" />
-            <ComponentRef Id="cmp7FC4A5011730D9EB11AEC16FBF3FCCDB" />
             <ComponentRef Id="cmpECEA3A8AB38FEEEC397A918E3448B3FF" />
             <ComponentRef Id="cmp94999281E0A3076D403238524AFB167D" />
+            <ComponentRef Id="cmp9C2DF618CF1CC43B8EF8B5EC5E790D8D" />
             <ComponentRef Id="cmpBCF3C38FB8142F10977444858EFAF20D" />
             <ComponentRef Id="cmp42FE31D214E88600BC5DE868A244BA20" />
             <ComponentRef Id="cmp4DCABA2450B8FD31596D1000125A9FE7" />
@@ -6101,10 +6101,10 @@
             <ComponentRef Id="cmp37A980D1D9994A0D167DE162CAE14563" />
             <ComponentRef Id="cmp15057E46DBC2EC95718BB05763490EB0" />
             <ComponentRef Id="cmp48D635437A02076A25FC10E3123EEA84" />
-            <ComponentRef Id="cmp0DED126D0ECE427959CFBBA6EFDFCADB" />
             <ComponentRef Id="cmp83BF2BE446B53D1262934BEDEDCA0A49" />
             <ComponentRef Id="cmpB763E41A7087AB6535F869DE6FA530B9" />
             <ComponentRef Id="cmpAA56F765637EDE501F0EC44A1F0396BB" />
+            <ComponentRef Id="cmp98E4FDDFCBE61F31CA14B70063E5EDEB" />
             <ComponentRef Id="cmp545437FAEFB14D6F2392ABDAAD90F3C7" />
             <ComponentRef Id="cmp63899C7FF83CD37A1CB64BED258A0C47" />
             <ComponentRef Id="cmpAD0D6F02EBA3855DF8C31C7AC90E468C" />
@@ -6127,9 +6127,9 @@
             <ComponentRef Id="cmp1D3D3FE8D3C4513B1536EB8B0AACEBE1" />
             <ComponentRef Id="cmpB0718E71D7A15CCA7375389A12F7D568" />
             <ComponentRef Id="cmpE649532D45F37D54928D095F9FA83399" />
-            <ComponentRef Id="cmpD5E8E7767198779920AC9D93B8E05087" />
             <ComponentRef Id="cmp96153B9C1921EF93C9484B51120C392D" />
             <ComponentRef Id="cmpA3D8659E0B2EB9572352196896EB4DC6" />
+            <ComponentRef Id="cmpE288423A55FE6E9FE079B94C37C1D745" />
             <ComponentRef Id="cmp42B92586860E12CFF7E8A202F62CA257" />
             <ComponentRef Id="cmp524E28243CC9788C41819437014F3F7D" />
             <ComponentRef Id="cmp0165D93E848BF589D3E0D3863617F9F0" />
@@ -6163,9 +6163,9 @@
             <ComponentRef Id="cmp403B76F26F2AB3EBEC4773C05C428394" />
             <ComponentRef Id="cmpB01EC52324F9B87FF652ADBB432533AB" />
             <ComponentRef Id="cmp8012F0215BB802A4015A5806B7E769F6" />
-            <ComponentRef Id="cmp85D44AA2C7A7BF68B1A6F1A7ABC1A06B" />
             <ComponentRef Id="cmpA5306E7DCB05BF7D6514ECA36217A97F" />
             <ComponentRef Id="cmp8BB06418615FA6C96B3B7BD88C3D0872" />
+            <ComponentRef Id="cmp7BBCB0DF1745D0ACA74311CC42EBF8A2" />
             <ComponentRef Id="cmp271EE413AA0CFA81047392C231D35019" />
             <ComponentRef Id="cmpE6F2C1F15F5A672D8597DA20C7FBBEE4" />
             <ComponentRef Id="cmp251FD3E326DDCE15861F27468BA833F6" />
@@ -6216,9 +6216,9 @@
             <ComponentRef Id="cmpAB9D9954A1CC38F64EDAC5266657C35E" />
             <ComponentRef Id="cmpB2A7275C2B928AA4B05A2C6CCAEDB373" />
             <ComponentRef Id="cmpE341C9178CD349DCB605EB78561663C9" />
-            <ComponentRef Id="cmpBABC07A869239A23E8DD502A034DDAD5" />
             <ComponentRef Id="cmpB3830B2F5405EB63585D70D9B4A8083B" />
             <ComponentRef Id="cmp609ECF22CBCD5D733FA476301D478408" />
+            <ComponentRef Id="cmpCBB12BA1748F6EECD91AC628B7E34992" />
             <ComponentRef Id="cmp6EF74500F8C5864E4C97AF617F709A3D" />
             <ComponentRef Id="cmp4825A8273E6E3207AA24CD61156AEA19" />
             <ComponentRef Id="cmp844772384C0923BF32EEFB91E2724F8B" />
@@ -6330,9 +6330,9 @@
             <ComponentRef Id="cmpD414E4B59E15E3F172C4DB44310A707D" />
             <ComponentRef Id="cmp13E8F7C78FCED4FAB93CAFB0EA4A4205" />
             <ComponentRef Id="cmp5A383CDD64BCF64C9DD945784B8734D2" />
-            <ComponentRef Id="cmp5E03B4823617D47A7CD22E2DA0822E25" />
             <ComponentRef Id="cmp5FB7157FEA8EDC9D2D10814DA15518AE" />
             <ComponentRef Id="cmpC0EA9433103A723191792448380E84AB" />
+            <ComponentRef Id="cmpB379F478799A33A4B4343BA15AC89F48" />
             <ComponentRef Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" />
             <ComponentRef Id="cmpB69D649FD24EBC270A2013375C2AF99B" />
             <ComponentRef Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" />
@@ -6356,9 +6356,9 @@
             <ComponentRef Id="cmp4ED39EDE761ED68263635882802FB1B5" />
             <ComponentRef Id="cmp2A0B3E88742D800F88F70A714BAC94B5" />
             <ComponentRef Id="cmpE3495C0DD75A31199E40EAA7E5128E6C" />
-            <ComponentRef Id="cmpA607917E0A707E1D4D68FF193DC8AD13" />
             <ComponentRef Id="cmp876FCC4B6F7590AC9D51ABDD32229647" />
             <ComponentRef Id="cmp9BFABAFD4BCCB0E223A5423F9E48A908" />
+            <ComponentRef Id="cmpE9D81FD7D6925835AD074DAA91B1B02F" />
             <ComponentRef Id="cmp545D8CBEAE57C9BE9C9B852D32CB58B3" />
             <ComponentRef Id="cmp5543C526734BEBD6DBA8D3F4CCAC4906" />
             <ComponentRef Id="cmpDA11D2F04D85A50CE393C4C23CCED63F" />
@@ -6391,9 +6391,9 @@
             <ComponentRef Id="cmp5F55270F607737A772BFBE2D8F6B76E4" />
             <ComponentRef Id="cmp9EF03D7C53CEE400751AD1905625B82B" />
             <ComponentRef Id="cmpC4F524A9EBF63DAC78B9678CF113D652" />
-            <ComponentRef Id="cmp89FDDB909B522C82BBBFAFD54B105DA2" />
             <ComponentRef Id="cmp401224722DA5F5678A1230A4DEC4B453" />
             <ComponentRef Id="cmp2970C04AAF17425A9A2994CDC024E65D" />
+            <ComponentRef Id="cmp72361F975A27A638FD3BC8AD8D3C24C5" />
             <ComponentRef Id="cmp23C361C4E13CFE366910008069F72682" />
             <ComponentRef Id="cmp9960D1074D8095DBAE42055E438F961F" />
             <ComponentRef Id="cmpB5530AB070E5EBD970CBE61AB78EEABB" />
@@ -6509,9 +6509,9 @@
             <ComponentRef Id="cmp221C334CE6510BD95538F285D482251F" />
             <ComponentRef Id="cmp74B0B7D2461EE67BC1B2C706CD41372F" />
             <ComponentRef Id="cmp572CBAA060A870457B636480C182F6E3" />
-            <ComponentRef Id="cmpBC9A9F6548ABF9C136BBB1E04EA8012C" />
             <ComponentRef Id="cmpD8BD7D4C976FE7FE527348B4E7F85B8D" />
             <ComponentRef Id="cmpD5A2C7B5CF9A37015F3B71F2DC61EC0B" />
+            <ComponentRef Id="cmp33B1D8F375238B9F828BCE9F9EF759BD" />
             <ComponentRef Id="cmp09F316A7E95457F48227B20D09F687C7" />
             <ComponentRef Id="cmpB6B3D29C26A5E102831B92476CC50A1D" />
             <ComponentRef Id="cmp755719BF8C89385B0BC1EC8745FE6612" />
@@ -6567,9 +6567,9 @@
             <ComponentRef Id="cmp57A64B3DE0AC55D98CE59F12924273CC" />
             <ComponentRef Id="cmpA1B08A40078EBC9B16C30E191F975071" />
             <ComponentRef Id="cmpCCC37C04C16D0797C148FE92B11D4D77" />
-            <ComponentRef Id="cmp9CB9480A6712E96612C0E6B19C8D015C" />
             <ComponentRef Id="cmp133EB89F214BEF04B57E383DC1B17E5D" />
             <ComponentRef Id="cmp1D46EDC68E31CEEC9FD00781E3A5EA61" />
+            <ComponentRef Id="cmpFDB6C90906A96F41FA727D16A7CF6A27" />
             <ComponentRef Id="cmp6A927AFF9D7CBE438F31603C59A5D1A6" />
             <ComponentRef Id="cmp3AC709C29C5C98FAE63EC5ACF073B2AF" />
             <ComponentRef Id="cmpF584FEE91889D98A4299209A1B9B1B94" />
@@ -6593,9 +6593,9 @@
             <ComponentRef Id="cmp0631D52AB2CC9A302EABD7E074F5677D" />
             <ComponentRef Id="cmpF717085B273764E99EDA68C7F0EE158E" />
             <ComponentRef Id="cmp4E07D562E97B5A66522EB87589E3C876" />
-            <ComponentRef Id="cmpDDE3512878BC62F29153D78C18FB2E3B" />
             <ComponentRef Id="cmp7A04B677540DBCD0BD49BD5C26172FF4" />
             <ComponentRef Id="cmp2ED0ECADA753ED85E1B455FC4609530F" />
+            <ComponentRef Id="cmp8BDD1ECFB41E61E61E220BFCCFB6DE10" />
             <ComponentRef Id="cmp0DBA9B291A7405C6A2536BF95D2BB5F2" />
             <ComponentRef Id="cmp60C52F8E3D2C4A2FBFA3AC5E7544E17F" />
             <ComponentRef Id="cmp0EDB1564DE086E770DD3ECB2B7FEB447" />
diff --git a/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj b/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj
index 2681cd664d3e..7505381b88b5 100644
--- a/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj
+++ b/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Azure.Commands.Common.Authentication</RootNamespace>
-    <AssemblyName>Commands.Common.Authentication</AssemblyName>
+    <AssemblyName>Microsoft.Azure.Commands.Common.Authentication</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />