Apply changes in bookmark+ sources for new version of bookmark+.el.(2.1.1).