Revert "typo"

This reverts commit 648a45a8907eca6e9295b17b82b4eb670f1821c4.
Revert "Slaves time out based on uptime"

This reverts commit 19ad75380aea191a852ab0a5ac85631d2a6aca10.
More generic name for master

OKTA-TEST