Set staticdata dir appropriately based on the argument
Merge remote-tracking branch 'origin/fix_server_conf'

* origin/fix_server_conf:
  Set staticdata dir appropriately based on the argument