Merge branch 'stable-3.0' * stable-3.0: Add custom stamp to add its-base revision to version number Change-Id: Id748494753b7d4575b863d5edf2a2a176aae9bdf