[fixed] Mantis 2924 - Rewritten Forcechoke so that Armour will now
mitigate some of the damage 

Change-Id: Ie4fb4c259ef0f3e5f1c75bfa1ac81282c84cc1d7
Merge "[fixed] Mantis 2924 - Rewritten Forcechoke so that Armour will now mitigate some of the damage " into unstable