Merge pull request #65 from daniellemayne/develop

bugz 4527: set better subnet id to ensure uniqueness