Missed a merge conflict marker.
Merge branch 'master' of github.com:libris/librisxl
Removed unnecessary passing of whelkid to components.
Merge branch 'master' of github.com:libris/librisxl
Removed unused whelk id for delete() methods. Forcing build to be 1.6.