Changes related to enabling mail virtual domains modules