CLOUDSTACK-4433:[VMware]Registration of template using the downloaded
template URL is failing.
CLOUDSTACK-4454:object_store - Not able to delete secondary storage when
existing snapshots are deleted.
CLOUDSTACK-4455:object_store - Template sync results in private
templates being synced to all the secondary stores.
CloudStack CLOUDSTACK-1365
UI support for baremetal PXE server

CloudStack CLOUDSTACK-1364
UI support for baremetal DHCP server

Conflicts:

	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java