merge BBC-849-fix-agile-startup into default
merge BBC-849-fix-agile-startup into default

edgehosting/jira-dvcs-connector,markphip/testing,markphip/testing,edgehosting/jira-dvcs-connector,markphip/testing,edgehosting/jira-dvcs-connector