add more tunables
fix a merge conflict
Merge pull request #99 from rackerjoe/v4.1.3rc

cherry pick 276e02eed18a269da323f6f833b2acaea82b05c5 from master

Merging pre-gate so QE can go go go.
Merge pull request #94 from rpedde-rcbops/rpcdaemon-updates

add more tunables

cherry pick 276e02eed18a269da323f6f833b2acaea82b05c5 from master

Merging pre-gate so QE can go go go.
revert part of this change back to origin
Merge pull request #100 from rackerjoe/v4.1.3rc

cherry pick 276e02eed18a269da323f6f833b2acaea82b05c5 from master

Another pre gate merge for QE go times.