Bugfix update for #548
Chaos bugfixes

Changes to Plague Marines, Obliterators, Rhinos, Land Raiders and
Forgefiends. Comprehensive details are listed in #552
Merge remote-tracking branch 'upstream/master'