Fixing compiler warnings.

Change-Id: Icdf96832e97abd763134713b0e1af11b474d4e90
Merge topic 'fix_parallel_amrconnectivity' into next

13ffe8a Fixing compiler warnings.