WPBQA-246 Build changes for the jira branch.