Merge "New JJB file for portal container"