Merge duplicate code for publish of http&https and convert them to publish steps, simplify the package groups and categories steps into a single comps step