master
8313785: Fix -Wconversion warnings in prims code
8216167: Update include guards to reflect correct directories