Merge "Fix tacker endpoint port" into stable/colorado