Merge "Added architecture tests to validate ONLY NCMP REST/Service dependencies"