--- a/components/samba/samba.p5m.common	Mon Feb 15 08:11:32 2016 -0800
+++ b/components/samba/samba.p5m.common	Tue Feb 16 11:30:34 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 
@@ -33,15 +33,14 @@
 # General dirs generated in sample-manifest but with bad attribs.
 <transform dir path=etc$ -> drop>
 <transform dir file link path=opt.* -> drop>
-<transform dir path=usr$ -> drop>
-<transform dir path=usr/bin$ -> drop>
-<transform dir file path=usr/include/gssapi.* -> drop>
-<transform dir path=usr/lib$ -> drop>
-<transform dir path=usr/share$ -> drop>
-<transform dir path=usr/share/doc$ -> drop>
+<transform dir path=usr.* -> drop>
+<transform file path=usr/include/gssapi.* -> drop>
 <transform dir path=var$ -> drop>
 <transform dir path=var/lib$ -> drop>
 
+# Unit test suite testtools is now the python package
+<transform file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools.* -> drop>
+
 # Samba customized krb5-config
 <transform file path=usr/bin/krb5-config -> drop>
 

--- a/components/samba/samba.proto-objects	Mon Feb 15 08:11:32 2016 -0800
+++ b/components/samba/samba.proto-objects	Tue Feb 16 11:30:34 2016 -0800
@@ -1,10 +1,6 @@
-dir  path=etc
 dir  path=etc/samba
 dir  path=etc/samba/private
-dir  path=usr
-dir  path=usr/bin
 file path=usr/bin/krb5-config
-dir  path=usr/include
 dir  path=usr/include/gssapi
 file path=usr/include/gssapi/gssapi_krb5.h
 dir  path=usr/include/samba
@@ -123,7 +119,6 @@
 file path=usr/include/samba/util/xfile.h
 file path=usr/include/samba/util_ldb.h
 file path=usr/include/samba/wbclient.h
-dir  path=usr/lib
 dir  path=usr/lib/python2.7
 dir  path=usr/lib/python2.7/vendor-packages
 dir  path=usr/lib/python2.7/vendor-packages/64
@@ -1013,9 +1008,6 @@
 file path=usr/lib/samba/security/$(MACH64)/pam_winbind.so
 file path=usr/lib/samba/security/pam_smbpass.so
 file path=usr/lib/samba/security/pam_winbind.so
-dir  path=usr/share
-dir  path=usr/share/man
-dir  path=usr/share/man/man1
 file path=usr/share/man/man1/dbwrap_tool.1
 file path=usr/share/man/man1/findsmb.1
 file path=usr/share/man/man1/gentest.1
@@ -1052,20 +1044,16 @@
 file path=usr/share/man/man1/testparm.1
 file path=usr/share/man/man1/vfstest.1
 file path=usr/share/man/man1/wbinfo.1
-dir  path=usr/share/man/man3
 file path=usr/share/man/man3/ldb.3
 file path=usr/share/man/man3/ntdb.3
 file path=usr/share/man/man3/talloc.3
-dir  path=usr/share/man/man5
 file path=usr/share/man/man5/lmhosts.5
 file path=usr/share/man/man5/pam_winbind.conf.5
 file path=usr/share/man/man5/smb.conf.5
 file path=usr/share/man/man5/smbgetrc.5
 file path=usr/share/man/man5/smbpasswd.5
-dir  path=usr/share/man/man7
 file path=usr/share/man/man7/libsmbclient.7
 file path=usr/share/man/man7/samba.7
-dir  path=usr/share/man/man8
 file path=usr/share/man/man8/eventlogadm.8
 file path=usr/share/man/man8/idmap_ad.8
 file path=usr/share/man/man8/idmap_autorid.8
@@ -1113,6 +1101,7 @@
 file path=usr/share/man/man8/vfs_fake_perms.8
 file path=usr/share/man/man8/vfs_fileid.8
 file path=usr/share/man/man8/vfs_full_audit.8
+file path=usr/share/man/man8/vfs_glusterfs.8
 file path=usr/share/man/man8/vfs_gpfs.8
 file path=usr/share/man/man8/vfs_linux_xfs_sgid.8
 file path=usr/share/man/man8/vfs_media_harmony.8