be8993
- Resolves: 1255578 - conntrackd could neither be started nor be stopped (remove some merge artifacts and don't bump the version too much)