Add control.yaml to bind conary-policy repo
Use conary-policy trunk always
Master, not trunk