Don't convert numeric protocol values to int

They are treated as strings everywhere. Converting them to int causes problems
when using postgresql as the database backend because it doesn't automatically
cast them back to integer.

Change-Id: I9f0a5149d24a4c003409728e50376569c97e7325
Closes-bug: 1330490
Updated from global requirements

Change-Id: Ie0621bc8226585199a7c36771f23fc125747d3f9
Merge "Don't convert numeric protocol values to int"
Merge "Updated from global requirements"