Do not need to rename contents affinitic refs #5901
Merge branch 'master' of github.com:affinitic/ric.core

Conflicts:
	ric/core/tests/robot/contents.robot