Replace search and caret with icon-font
Merge branch 'master' of github.com:openshift/origin-server into various-work
Merge pull request #1650 from sg00dwin/various-work

Merged by openshift-bot