YARN-2558. Updated ContainerTokenIdentifier#read/write to use ContainerId#getContainerId. Contributed by Tsuyoshi OZAWA.

(cherry picked from commit f4886111aa573ec928de69e8ca9328d480bf673e)

Conflicts:
	hadoop-yarn-project/CHANGES.txt