Merge "Fix accessing shared policies, add assoc tests" into feature/qos