Bug 1021365 - fixed handling server without deployment support

[merge]