Fix and simplify par params parsing in get_containing_layout.

The previous verion did not catch \align <alignment>.

Richard, this should go to branch as well.
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.11.29-10.00