Merge "Fix https config for admin portal"