Update of 2015_CO6_CO5_shelfdiagnostic branch to r5936 in order to avoid merging problems with INGV wave coupling branch