Merge "Support https when testing ODL"