Actually, ignore that comment about `stripBrooklynProperties`. I see that `AbstractEc2LiveTest` doesn't use it. We'll fix all of those in one go, rather than trying to do it in this PR.