Remove hard-coded default webspace
Merge branch '1307' into 1484
Merge pull request #1501 from ogail/1484

Remove hard-coded default webspace