MergeParent: Add config value for merge base parent

With the git flow devleopment approach, the merge base is with origin/develop
not origin/master.
Add config value for this.

Testing Done: Created review.
Bug Number: none
Reviewed by: trivial