[MAESTRO-3205] update demo compositions

We should now be using the Fog plugin's AWS tasks instead of the built-in
alternatives.
[MAESTRO-3205] use demo_keypair consistently