Lose two more bolts/nuts from the assembly and reduce the parts to print count

Lose two more bolts/nuts from the assembly and reduce the parts to print count by one by combining the Upper_BOM and BOM_Block into a single piece.