Added SRVPickerButton
Merge pull request #6712 from samvoigt/master

Added SRVPickerButton