Merge Package Manager UI Improvements into Revit2015 and fix merge conflict already in branch