Merge "Jenkins jjb setup for features"