Add a helpful error message for rq if installLabelPath is empty (CNY-3853)
Add control.yaml to bind conary-policy repo
Use conary-policy trunk always
Master, not trunk
Normalize relative paths in includeConfigFile
Merge branch 'feldspar' into stable