Master wmsstaging3 jco

Depends also on wmsstaging2.  See commits.  
missing context in the browse here