Remove accidentally added columns while resolving merge conflicts Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>
Remove accidentally added columns while resolving merge conflicts
Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>

jcshen007/cloudstack,wido/cloudstack,GabrielBrascher/cloudstack,DaanHoogland/cloudstack,resmo/cloudstack,GabrielBrascher/cloudstack,DaanHoogland/cloudstack,wido/cloudstack,GabrielBrascher/cloudstack,DaanHoogland/cloudstack,DaanHoogland/cloudstack,jcshen007/cloudstack,GabrielBrascher/cloudstack,resmo/cloudstack,jcshen007/cloudstack,GabrielBrascher/cloudstack,jcshen007/cloudstack,DaanHoogland/cloudstack,wido/cloudstack,GabrielBrascher/cloudstack,DaanHoogland/cloudstack,resmo/cloudstack,GabrielBrascher/cloudstack,wido/cloudstack,DaanHoogland/cloudstack,resmo/cloudstack,wido/cloudstack,wido/cloudstack,jcshen007/cloudstack,resmo/cloudstack,jcshen007/cloudstack,wido/cloudstack,resmo/cloudstack,jcshen007/cloudstack,resmo/cloudstack