Engine Plugins are being created with includes that are out of order

Header files are out of order in the plugin.cpp files.

WORKAROUND

• In Visual Studio, open UE4 > Plugin > "Button" > Source > "Button" > Private > ButtonStyle.cpp
  • Cut Button.h from the top of the #includes and paste it under ButtonStyle.h
• In Visual Studio, open UE4 > Plugin > "Button" > Source > "Button" > Public > ButtonCommands.cpp
  • Cut Button.h from the top of the #includes and paste it under ButtonCommands.h

This is a regression from CL 3254907

1. Open QAGame in P4 or GitHub
2. Edit > Plugins
3. Create new plugin
4. Enable Is Engine Plugin
5. Select Editor Toolbar Button and give it the name "Button"
6. Press OK in the message window
7. Go to Other and Enable your new plug in
8. Restart the Editor
9. Click Yes on the rebuild modules message.

Result: The project will not rebuild

Expected Result: The project is able to be rebuilt