Fix Makefile mismerge and IPS manifest of OS-5585 and OS-5591
OS-5591 Double flock(3C) causes undue block
OS-5585 fcntl(F_OFD_GETLK) should return EINVAL on bad parameters
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>

*** 22,37 ****
--- 22,42 ----
  set name=variant.arch value=$(ARCH)
  dir path=opt/os-tests
  dir path=opt/os-tests/bin
  dir path=opt/os-tests/runfiles
  dir path=opt/os-tests/tests
+ dir path=opt/os-tests/tests/file-locking
  dir path=opt/os-tests/tests/sigqueue
  file path=opt/os-tests/README mode=0444
  file path=opt/os-tests/bin/ostest mode=0555
  file path=opt/os-tests/runfiles/delphix.run mode=0444
  file path=opt/os-tests/runfiles/omnios.run mode=0444
  file path=opt/os-tests/runfiles/openindiana.run mode=0444
+ file path=opt/os-tests/tests/file-locking/acquire-lock.32 mode=0555
+ file path=opt/os-tests/tests/file-locking/acquire-lock.64 mode=0555
+ file path=opt/os-tests/tests/file-locking/runtests.32 mode=0555
+ file path=opt/os-tests/tests/file-locking/runtests.64 mode=0555
  file path=opt/os-tests/tests/poll_test mode=0555
  file path=opt/os-tests/tests/sigqueue/sigqueue_queue_size mode=0555
  file path=opt/os-tests/tests/spoof-ras mode=0555
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL