Change states to use short-dec style

These changes should be cosmetic only. Please double-check as they were largely automated.
@whiteinge This line should be removed and it should be instead added above as the following:
```
redis_service:
  service.{{ svc_state }}
```