Fix bond and bridge option rendering order, add more bridge options

Fix bond and bridge option rendering order, add more bridge options

Better way of handling option ordering in bond and bridge interfaces and add missing bridge options.

This patch reverts commit from yesterdays pull request:
https://github.com/saltstack/salt/pull/9214

I think this is better way of option order handling.