Subject: Obj Smoke refactor to use behaviors
* added behaviors calls
* removed a '\' string continuation as per Verbanic's notes
* changed metadata addition to the headers pertaining to the changes in the client

Change-Id: I0418d6612288a67a08cfbff6fbdc2dfbb861667b
Merge "Subject: Obj Smoke refactor to use behaviors * added behaviors calls * removed a '\' string continuation as per Verbanic's notes * changed metadata addition to the headers pertaining to the changes in the client"