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