Master wmsstaging3 jco

Depends also on wmsstaging2.  See commits.