Revert "Remove conduitSubscriptions and maxInactivityDuration"

This reverts commit b7a00ff597ddce901d0c1268c752c713000f60e4.
Merge pull request #18 from dieterdemeyer/master

Reverting change