2.07.2:zeress:29 CB Updates

- Reverted and adapted CBs to properly fit with CK2+