Merge pull request #1074 from robhoes/tallahasse

Tallahassee: Fix management interface issue (XOP-261)