Changed content-policy and cookie-eater completer to work on conkeror-master branch.