[ticket/208] Move includes files out of portal folder into includes

The includes files were inside a portal folder until now. This is no longer
needed with the extension.

B3P-208
[ticket/208] Fix paths after moving includes files

B3P-208
[ticket/208] Make sure functional tests only try to enable portal once

Until now, the portal would access the acp page for enabling it every time
a functional test is run. This change will make sure that this happens only
once and therefore slightly speeds up functional tests.

B3P-208
Merge pull request #209 from marc1706/ticket/208

[ticket/208] Move includes files out of portal folder