Fix lyx2lyx issue with complex beamer arguments.

Fixes: #9254
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.08.30-12.00