Port package manifest changes from Bug 903433 and Bug 850430 to SeaMonkey, r=bustage-fix
CLOSED TREE