Merge "Revert "Move patch script class to the server tree.""