additional fixes for finding master w/ and /wo kubernetes