guess id from ip
Merge pull request #4431 from giantlock/develop

fix #4429
Merge pull request #4422 from ahammond/guess_id_from_ip

guess id from ip
Strip out ec2 specific calls pending a better more generic solution
Fix #4427
fix backtrace when environment empty