Airavata server populates incorrect URLs (GFac, interpretter ...) when HTTPS is enabled in tomcat

To re-produce the issue follow instructions below,
1. Deploy airavata using webapp distributions in tomcat
2. Start tomcat
3. Connect to registry
4. Go to View -> Airavata Registry and inspect "Airavata Configurations" inspect GFac, Intepretter Service, Eventing service .. urls
5. You will see those service urls contain https port rather than configured registry service port

Thanks
Amila