Images and container module has to accept both APIs of the form /XXX/XXX/action and sometimes /XXX/action which result in inconsistencies among APIs and these conditions are not being handled currently in the code.

[thenakliman]