Merge the 3 turret rendering traits into WithTurret.
Make WithSpinner consistent with WithTurret.
Merge pull request #3283 from pchote/turret-rendering

Unify turret rendering traits