Merge "Modify aaf docker Jenkins template & script"