Move them back to the -server package. This makes updates from 3.8 conflict-free. found by steven@, help from espie@ ok pvalchev@
Move them back to the -server package. This makes updates from 3.8 conflict-free. found by steven@, help from espie@ ok pvalchev@