Many fixes for Peacock refs #2656
Merge commit '07949f7f03696b5dea7214807bf1a786afa16ae7'