Build in override that includes deploying machines when gathering properties.

This way we can get the details of a machine we're currently deploying