Merge branch 'php_basestub_metadata_callback' of github.com:stanley-cheung/grpc into php_basestub_metadata_callback