6.1.x service builder

Hi Jesse,

Would you mind reviewing and testing these portlet changes on 6.1.30 ? I've tested them on 6.1.30, but I'd like to double check in someone elses environment.

Thanks,
Jim