Fix e2e testing issue

It turns out the fqdn issue is the only issue in e2e test. I ran into some weird ApiObj encode/decode issue, which is fixed by 'make clean' completely. 

Fix #1385
Perhaps strings.TrimRight is more appropriate.