Fix for EUCA-5921 - support Windows computer name change

This fix has two commits:  the first one to remove the commit that was done incorrectly, then the second to do the commit correct.