Merge "Update test and code coverage definitions for obsolete/changed packages."