Merged some changes that were made to the glusterfs state module.

Cleaned up my implementation of my bug fixes.