CNAPI-247: Remove merging marker
CNAPI-247: Remove merging marker

misterdjules/sdc-vmapi,richardkiene/sdc-vmapi,arekinath/sdc-vmapi,misterdjules/sdc-vmapi,joyent/sdc-vmapi,arekinath/sdc-vmapi,richardkiene/sdc-vmapi,joyent/sdc-vmapi