Merge: r268811

Update to byacc 20140715

PR:             191020
Submitted by:   gcooper (yaneurabeya@gmail.com)