merged Johns delete replace
merged Johns delete replace

dfcoffin/OpenESPI-GreenButtonCMDTest,energyos/OpenESPI-GreenButtonCMDTest,RonPasquarelli/OpenESPI-GreenButtonCMDTest,MartyBurns/OpenESPI-GreenButtonCMDTest,RonPasquarelli/OpenESPI-GreenButtonCMDTest,dfcoffin/OpenESPI-GreenButtonCMDTest,MartyBurns/OpenESPI-GreenButtonCMDTest,energyos/OpenESPI-GreenButtonCMDTest