version bump to 6.0.5

Change-Id: I4aa6825f0f587328b7f67adc04717de5dada1771
Merge "version bump to 6.0.5" into rc