LPS-31315 [ROLLBACK] Fix tests

Hey Brian, 

these set of commits broke the test PortletExportImportTest and it hasn't been fixed in the last week.

We think the best option would be to revert those changes and commit them again once the developer can ensure they won't break the tests.

This pull reverts all commits for http://issues.liferay.com/browse/LPS-31315, and tests in are now passing. The commits that have been rolled back are:

05abfcb
bc9aa0d
e989734
6e32512
c86878c
63403db
b5ac761
25fe3c4
849d3e2
d02a39d
dafc922d09bf661a34c125211332a258c5101c1a
37980583e82b96737c6c7e1f1804e5b296152431
6664b1b8fd75224ee20beeb829f6fc266ff2f8c0
ec913ea26679d2c325074adf65681abb5b940e27
e5bf488583e053ea4987cb903c2112a363324778
7055528c573223b0c239abe3a58807b1317908f9
da457e45ec06367f1fe64726ec5060495ca91ebe
addd35e4ed9c1b557f3a5df241864fdd4879822a
5bef731db78e6fcb0e1b025f57bdeffa187db89c
4959a8ac963127024f07cf3a8bef65e3a730f00d

Thanks!