This complete explanatory answer convinced me to try "Clear credentials" and it worked perfectly. No loss of apps
and I even reapplied my old pin and it locked the screen as desired. Both Swipe and None became active along with the other choices. Thanks. Virgin S5 OS 5.0