refs #4121 code cleanup and copy plugin/theme folder if needed
Merge remote-tracking branch 'origin/master'