Revert "Dirty fix regarding Contrail controller patch"

Fix commit on the upstream.

This reverts commit cf550288bd38dace532118d6d863c7c6fcf751a4.
Correct typo in ifmap parameter
Add --rabbit_password argument to api-server