Merge "Make common->compute->shelve_server param more clear"