Merged jenkinsci-master into my branch (mainly view feature)