Move 'advanced' block to the end of the settings form
Make $force parameter only override the task check for required plugins (#1489437)