Always add 'form-control' class to select boxes

This enhances #2103 and obsoletes #2134.