Assume state='directory' if recurse is set and previous state was 'directory'

Resolves this issue: https://github.com/ansible/ansible/issues/2067
Merge pull request #4470 from jyap808/patch-1

Assume state='directory' if recurse is set and previous state was 'direc...