SD-1366: fix AMI images not working
Revert "SD-1366: fix AMI images not working"

This reverts commit 1b53d891fa6b3ea211ae287cf38d23219b9ef118.
Fix AMI boot on PXE.

JIRA-Reference: SD-1366
Reviewed-by: Simon Malatrait <smalatrait@iweb.com>
Reviewed-by: Yannick Simard <ysimard@iweb.com>
Merge branch 'disk-deployment'