Make the maintenance-release manifest a bit more generic

Change-Id: Icb97d70acc7c8af4beb329551131dc2c4fb3d8cc
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1