Renamed is_ami for boot_from_pxe.

JIRA-Reference: SD-1366
Reviewed-by: Simon Malatrait <smalatrait@iweb.com>
Renamed is_ami for boot_from_pxe.

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