moved isset_or()
https://www.pivotaltracker.com/story/show/48496065
Merge branch 'dev_clusters_48496065' into develop