ports should be ints in config (bug 1137696)

Change-Id: I26c0481f1f8987f310e3c3710be49d541418e3fd
mark 2.0 API as stable

Bug 1135230

Change-Id: Icb0ae39b5ac4514c04220b846ebbe24d059ba6c1
Merge "ports should be ints in config (bug 1137696)"
Merge "mark 2.0 API as stable"