Resolved MRN-1234:

Documented allow_overlapping_ips configuration change

Change-Id: I9228c130c50bbda0a96bb2b5cfb07f113d6b485d
Resolved MRN-1233:

Mentioned quantum section in the conductor config description

Change-Id: I3d87e990ced89bb4d5c10f5a366378bdf2926f27
Merge "Resolved MRN-1234:" into release-0.3