Integer Flavor Ids

Changed the flavor id type in the instances schema to an Integer in a patch.
Made changes to the test code. XML attributes are strings so made changes in code to handle that.

Fixes Bug #1165077

Change-Id: I6272c4cf9d22a6090f41b41a66e52506068532cc
Merge "Integer Flavor Ids"