NSX: fix indentations

Commit f43eb49f56accab87e4d1b6defcf78d1e697f9e6 had invalid
indentations.

Change-Id: I795d1960e79cc6fae889fbe8fca264d9e60e6f08
Ignore variable column widths in ovsdb functional tests

The ovsdb tests check the output of "ovsdb-client monitor" before and after
some operations. The first line of output is a header row with spaces for
column separation. The column widths can vary depending on the data in the
columns, so compress multiple spaces to one for testing.

Change-Id: I6b4690ea9ef1c1b215411ca2c39b1e65fec2c6c7
Partial-bug: #1336172
Merge "NSX: fix indentations"
Merge "Ignore variable column widths in ovsdb functional tests"