Change 'stop' hooks timing since 'after_stop' does not make after warden container stopped...

The correct order is:

  RUNNING

  -> before_stop

  STOPPING

  -> after_stop

  STOPPED

Change-Id: I8aa3117e17ecb6da6bde412e83864f8ee366d9f1
Merge branch 'feature/script-hooks' into develop
Merge branch 'develop'