[FIX] rpMasterAddressExists: Fix the return points
Merge pull request #1428 from vhpoet/release

[FIX] rpMasterAddressExists: Fix the return points