push version

Change-Id: Id7abaff868ad442af4cd712957deecacb76ed4da
Merge remote-tracking branch 'Slim/lp5.0' into lp5.0

Conflicts:
	config/common.mk