LPS-33362

Hey Patrick,  

I was thinking of combining bottom_include and body_bottom_include but since portal_pop_up templates reference bottom_ext_include (which is a reference to bottom_include) we can't simply merge the files. So I just moved him up into the body. Let me know if you have any questions about this.