Pass makedirs to file.managed, file.serialize states
Pass makedirs to file.managed, file.serialize states

Also some lint fixes, and since states modules aren't supposed to
directly make changes, two calls to os.makedirs() have been replaced.

Conflicts:
	salt/states/file.py

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt