sonata-project/jquery-ui-bundle: fixed dirty merge with master