Merge branch 'terminal-emulator' of git.gitlab.arm.com:systemready/systemready-scripts into terminal-emulator