Fix and simplify par params parsing in get_containing_layout.

The previous version did not catch \align <alignment>.
Merge remote-tracking branch 'github/build-bot-2.1.x' into bleeding-edge-2.1.x
2014.11.30-09.00