Update CP multiinstance patch for 10.0
Allow overriding the var since release will not be based on head