sysutils/cfengine2: backport yacc fix from trunk
Merge branch 'joyent/feature/miscfix/2014Q2' into joyent/release/2014Q2