Removing more differences between PM and PB.
Merge branch 'remove_packagemaker' into develop