BZ1029076 Improve commands used for server lifecycle