Merge "Optimize the jjb-deploy trigger regex"