Merge "Fixing a bug when setting a password for ODL controller"