Partition server start/stop in upgrade process
Updated changelog
Merge branch 'jm/modularize_upgrade'