use update test for maintenance branch
Merge branch 'SLE-12-GA'

Conflicts:
	Rakefile