asf - Revision 1916628: /incubator/public/branches/policy-rewrite-cleanup-122016