Revised bark beetle and windthrow codes and improved their interactions. Closes tickets #633 and #651