Allow server selection when running sql.php

Change-Id: I2a643eb3a517eba09b80da19158e0957441bcaa5
Merge "Allow server selection when running sql.php"