Ammendment to commit fa77346 to ensure service_credentials use service_host and port. Also fix amulet tests. Change-Id: Iccdec87b4885ab67465034577f9498f79c958dc4 Related-Bug: #1624173
fa77346