Merge pull request #10489 from s0undt3ch/develop

Lint fixes
Clean up lint changes

act_peer wasn't included enough.  Also cleared out **kwargs.
Merge pull request #10491 from gtmanfred/glusterfs

Clean up lint changes
Update to latest bootstrap script. v2014.02.16