bottleservice: Handle kernel default remote+branch more intelligently.

Change-Id: Ieeed486f65324d76579a0e2fb2ab967b3f15a4f5