Remove merge conflict markers from xsds & update targetNamespace

common.xsd has some merge conflict markers probably due to
some whitespace changes that some inadvertantly committed.
Also, Oxygen complains when the targetNamespaces aren't consistent
and according to Jorge Williams they should all remain at v1.1 even
for v2 api since the schema has remained the same.

Change-Id: I0d5aab4cc9a1eb9a1906d514b0058b1ac8e4958b
Minor changes to make wadl valid

Removing targetNamespace (that's an xsd thing) and removing
"(Optional)" from a param name and instead setting required="false"
for that param.

Change-Id: I8ec3d8d2daff58785fec9902f5664a234cddcd69
Merge "Remove merge conflict markers from xsds & update targetNamespace"