Amazon: update 'spice to' and nrj calls.
Merge remote branch 'origin/caine/amazon-nginx'