Master wmsstaging3 jco

Depends also on wmsstaging2.  See commits.  
better use the new API xmlid_to_object()  with raise_if_not_found = False

and i just realize that same comment applies above as well ;-)