Merge pull request #15118 from khelben/head_with_status_action_stack_level_too_deep

fixes stack level too deep exception on action named 'status' rendering 'head :ok'

Conflicts:
	actionpack/CHANGELOG.md