Merge proposals dependent on lp://qastaging/~mterry/ubuntuone-couch/no-ssl-validation

lp://qastaging/~mterry/ubuntuone-couch/no-ssl-validation has no merge proposals.