Change 4 space indent to 2

In order to comply with puppet-opestack standard all files where changed to
 be a uniform 2 space indent.

Change-Id: I1763f9229330fed3e6216cb2d2937a8154505981
Merge "Change 4 space indent to 2"