Use DATABASE/connection opt for db url in Savanna

DATABASE/sql_connection opt is now deprecated.

Change-Id: I58058f0d51e16de53e6472c8c01065438d709edc
Merge "Use DATABASE/connection opt for db url in Savanna"