Merge pull request #611 from jbonofre/AMQ-7444

[AMQ-7444] Fallback to remote location for remote address when socket has not been created yet