Merge "define endpoint type for os cloud in Janitor"