Fix shift-endnotes to get --decrement working and handle non-contiguous note ids

Fix shift-endnotes to get --decrement working and handle non-contiguous note ids #2520