Change qpid_port to IntOpt

Fixes bug 1161679

Change-Id: I4b64fccbb7871dfab4fb74534514aa269c31f03d
Merge "Change qpid_port to IntOpt"