merge updates and correct ordering #4433

#4433 

#### Changes

* Merge `cp_update_7002()` and `cp_update_7003()`
* Correct order of operations run to prevent [this error](https://github.com/openscholar/openscholar/issues/4433#issuecomment-30240829).