8642f18 Update the configuration so no more manual changes after branching are needed

Authored and Committed by churchyard 4 years ago
    Update the configuration so no more manual changes after branching are needed
    
    Signed-off-by: Everybody Likes This <everybody@likes.this>