fix: ensure correct precedence for roleDefinition and customInstructions when generating system prompt#3791

mrubens merged 2 commits intoRooCodeInc:mainRooCodeInc/Roo-Code:mainfrom

ChuKhaLi:fix/prompt-precedenceChuKhaLi/Roo-Code:fix/prompt-precedenceCopy head branch name to clipboard