Fix bug 906853: Remove popularity option when voting-end flag is active.

Also fixes bug 907978 since the flag will be off in R5.