Moving the default options[:lock] configuration into find_order_by_token_or_user so it can be used by both simple_current_order and current_order

Set simple_current_order to an empty order in case it's not found to avoid hitting the database needlessly

Using double quotes

Fixes #5647
Bump version
bump to beta