fix: broken cookiejar dependency

cookiejar latest version breaks dependency resolution

Squashed commit of the following:

commit 4592bb55e27754e11bf0ae8ff2115771a67cd770
Author: Travis Dempsey <dempsey.travis@gmail.com>
Date:   Thu Feb 20 16:11:06 2014 -0600

    fixed broken cookiejar dependency

    Change-Id: I130fd3873feaeb15b515cbe34b6ab15a6c7638c7

Change-Id: Ie87e347954ca39df5823ad1bd145e34b91febe53