bottleservice: Handle defaults less stupiderly

Change-Id: If6031e14df5d8bfa6aab49ac59e19f9f38f92b09