Adding support for a machine name suffix so that we can provide a nicer deployment scenario for a segregated farm