#910. make test with household naming order use explicit name ordering.
Merge pull request #923 from SalesforceFoundation/feature/910-hh-test-fix

#910. make test with household naming order use explicit name ordering.
Merge dev into feature/883-hierarchical-custom-settings-2