Make PDO branch compile again

Two small changes were involved

 * merge from master
 * change empty_string to empty_string() to adapt to recent HHVM changes