Merge "Fix searchguard docker build"