[KARAF-2168] Cleanup and refactoring after the change on the sync property