Merge "Improve ServerCfnInitTestJSON asserts and debugging"