Stop sidekiq before rails update code
Use restart instead of stop and start
Merge remote branch 'origin/prevent_inconsistence' into env_based_config