Merge pull request #2330 from jlipps/jlipps-1.0-beta

remove deprecated server args