Merge "Remove creation of httpboot folder"