Change %GLOBAL_VERSION% tag to %GLOBAL_VERSION_AND_TAG%

Change-Id: I201a6fd6d60ccec962893a0f90ef6f0d1864d08d
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>