Bug 720832: Add the ability to watch component starting with a string
realign the production branch