Merge "Align verify and staging tox jjb config"