* Complete r559094 by backporting remaining bits from upstream repository
  and adding the usual fixes for the pkg-plist.

PR:		254501
Approved by:	grembo (maintainer)