Fixes for escorting

Escorting state is now handled independently of restrain and
additionally fixed and issue with unrestraining and medics.