Consistent naming of Samba/CIFS related files.
Don't break strict aliasing rules.
Merge pull request #3716 from bfg1981/cleanup

Cleanup