Merge "Update docker build for EL7"