Enable locale module during installation
Merge commit '9acc9c2daa2b5049906ff3b9aada4d175464d0bc' into 7.x-stable