Branch 2016/dev_merge_2016. Rename cpp_WAD_TEST_CASES.fcm to cpp_WAD.fcm to match its shortened configuration name in its new location