Merge remote-tracking branch 'remotes/origin/master' into regexp

Conflicts:
	src/main/java/se/diabol/jenkins/pipeline/DeliveryPipelineView.java
	src/main/java/se/diabol/jenkins/pipeline/util/ProjectUtil.java
	src/test/java/se/diabol/jenkins/pipeline/DeliveryPipelineViewTest.java