port dbaas fix to contrib

Change-Id: I1e7f3c69c216d19705cab9bdcd7302e1b917fdd4