Master wmsstaging3 jco

Depends also on wmsstaging2.  See commits.  
why these 2 lines of commented code? does it come from a copy/paste? can it be removed for better clarity?