CMA-ES with Margin for Single-and Multi-Objective Mixed-Integer Black-Box Optimization