As conservative is based off ondemand the codebases occasionally need to be
resync'd.  This patch, although ugly, does this.
Signed-off-by: NAlexander Clouter <alex@digriz.org.uk>
Signed-off-by: NDave Jones <davej@redhat.com>