For ENG-5219, fix support for scale factor and up default number of ware...

...houses for the elastic hash function