Fix spacing and merging issues in adtran_olt flow_entry
Fix spacing and merging issues in adtran_olt flow_entry

Change-Id: I1fd9350b33205fc42a9325755edef3f3e2922b0d

opencord/voltha,opencord/voltha,opencord/voltha,opencord/voltha,opencord/voltha