GUI-450

implemented code and checks per 3.4 efforts. The services team is working on EUCA-8774 which should complete this. Suggest merging this while tracking the service dependency in Jira and testing once that is complete.