Server reload policy 3.6.x

This should fix redmine 5564.