Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I9049e6db9fd35d03b3e3ecfac77eff859f909035
BUG #14961: Fix pqDisplayColorWidget bug.

Fixed pqDisplayColorWidget to not accidentally override the
ServerManager state when the UI is being setup. The bug was arising
because the current component number was being shown in the UI, it acted
same as if the user changed the component number.

Change-Id: I4277eba3397a542e5f6613db37ac9ecc10128af5
Merge topic '14961_fix_color_widget' into next

6f39c159 BUG #14961: Fix pqDisplayColorWidget bug.